135 Commits

Author SHA1 Message Date
3e94e88f89 Merge branch 'develop' 2023-03-15 15:15:24 +08:00
efb659107b 下单流程修改,未完善 2023-03-15 15:14:08 +08:00
5e825c90a4 Merge remote-tracking branch 'origin/develop' 2023-03-14 18:22:17 +08:00
1844876845 小组采购分类临时更改 2023-03-14 18:21:00 +08:00
0f66cb98cc Merge remote-tracking branch 'origin/develop' 2023-03-14 18:14:57 +08:00
abdd201f6b 优化小组采购分类 2023-03-14 18:14:00 +08:00
e2f3d18e7e Merge remote-tracking branch 'origin/develop' 2023-03-14 18:04:20 +08:00
87720915f7 优化小组采购分类 2023-03-14 18:03:13 +08:00
彭桃
73cc7e66d2 1 2023-03-14 16:26:37 +08:00
彭桃
43c6e997af 1 2023-03-14 16:15:04 +08:00
a87d9e6fab Merge branch 'develop' 2023-03-14 15:37:25 +08:00
9217459610 增加佣金来源筛选 2023-03-14 15:35:40 +08:00
3b1fb1cda5 完善小组人员分佣,增加分佣记录区分来源 2023-03-14 11:48:06 +08:00
彭桃
d5c224d8fe 1 2023-03-14 09:52:36 +08:00
b7ed8c9370 Merge branch 'develop' 2023-03-14 08:53:12 +08:00
4015a21417 增加初步分佣算法,待完善后台分佣规则 2023-03-13 19:12:08 +08:00
彭桃
f86f1f95bb 新增获取商户信息接口 2023-03-13 16:34:00 +08:00
d97dbe8fcf 更新小组采购购物车加入 2023-03-13 15:09:28 +08:00
0deed15194 完善供应链分佣 2023-03-13 10:57:13 +08:00
彭桃
181386afd7 1 2023-03-13 10:04:52 +08:00
彭桃
ffa11f501e 新增返回是否完善商户信息 2023-03-13 10:01:34 +08:00
505f542d44 Merge branch 'develop' 2023-03-11 18:01:12 +08:00
2a70ad4623 队列任务分佣框架搭建 2023-03-11 18:00:01 +08:00
彭桃
cc2f74ae0b 商户编辑接口 2023-03-11 17:44:33 +08:00
531f595745 Merge branch 'develop' of git.excellentkk.cn:mkm/shop-php into develop 2023-03-11 16:45:45 +08:00
8fc3c52971 供应链分佣业务,增加分佣队列,业务逻辑暂未完善 2023-03-11 16:45:42 +08:00
彭桃
636df2af31 1 2023-03-11 10:51:11 +08:00
彭桃
cb640a492a 商户列表返回优惠券 2023-03-11 10:47:18 +08:00
efcb34c40a Merge branch 'develop' 2023-03-10 15:53:21 +08:00
b8a3516a20 完成订单接口更新 2023-03-10 15:49:57 +08:00
彭桃
8533ebdc60 商品列表 2023-03-10 15:39:16 +08:00
d4d07fa9ba 订单获取接口,增加获取订单来源 2023-03-10 15:16:00 +08:00
ba0d6a527e 优化获取订单 2023-03-10 14:43:57 +08:00
4d95c182a6 获取待付款订单增加来源 2023-03-10 14:41:26 +08:00
彭桃
93d9b27ee1 Merge branch 'master' of http://git.excellentkk.cn/mkm/shop-php 2023-03-10 11:38:32 +08:00
彭桃
5fc9c10654 Merge branch 'develop' of http://git.excellentkk.cn/mkm/shop-php 2023-03-10 11:38:17 +08:00
a09795df8a Merge branch 'develop' 2023-03-10 11:37:25 +08:00
2b936eab29 修改小组服务下单,增加source来源 2023-03-10 11:33:32 +08:00
彭桃
d66bcd3a52 1 2023-03-10 11:03:18 +08:00
0cc0a82a75 Merge branches 'develop' and 'develop' of git.excellentkk.cn:mkm/shop-php into develop 2023-03-09 17:58:40 +08:00
811d4c48c3 修改接口:佣金、分类、提现区分供应链、以及普通购物车 2023-03-09 17:51:56 +08:00
彭桃
b7b43001bd 1 2023-03-09 15:14:28 +08:00
彭桃
46795b4f08 商户入驻自动添加客服 2023-03-09 14:37:47 +08:00
彭桃
6e75d0a03f 主题色 2023-03-09 10:49:33 +08:00
ba1e07bb6f 修改小组采购 2023-03-09 09:51:26 +08:00
e971632acc Merge branch 'master' of git.excellentkk.cn:mkm/shop-php 2023-03-09 09:33:19 +08:00
彭桃
a537dfb8e9 商户按地址搜索 2023-03-09 09:31:28 +08:00
b07ecee60b 增加购物车类型 2023-03-09 09:27:50 +08:00
980d6b52ca 移除.htaccess 2023-03-08 17:40:01 +08:00
e76e78952d 修改提现入库字段,增加提现来源 2023-03-08 17:39:45 +08:00