156 Commits

Author SHA1 Message Date
76dada9dbf 增加商户入驻商户类型验证 2023-03-18 09:26:52 +08:00
c6eebb4c1d 修复微信昵称、头像 2023-03-17 18:02:22 +08:00
ef7f2622c1 修改订单数量显示 2023-03-17 16:49:37 +08:00
236b78e60d 修改获取小组采购所有订单 2023-03-17 15:50:46 +08:00
4276a74af2 获取订单核销码兼容 2023-03-17 11:42:11 +08:00
0afc6f5b87 优化小组采购商品获取 2023-03-17 11:31:05 +08:00
47f53e660e 修复分佣逻辑 2023-03-17 09:54:11 +08:00
9448f5a2b6 Merge branch 'develop' of git.excellentkk.cn:mkm/shop-php into develop 2023-03-17 09:36:52 +08:00
da14495e04 修复佣金供应链团队ID 2023-03-17 09:35:41 +08:00
53b867bffc Merge branch 'develop' 2023-03-16 14:43:17 +08:00
71669f1ff4 更新小组采购分佣队列任务 2023-03-16 14:41:22 +08:00
f94305c479 Merge branch 'develop' 2023-03-16 12:04:24 +08:00
6f8ab98bf5 修复小组采购,购物车内容状态没更新 2023-03-16 12:03:10 +08:00
彭桃
c7336b3387 1 2023-03-16 10:59:49 +08:00
a20f000909 Merge branch 'develop' 2023-03-16 10:57:29 +08:00
ae6481d272 完善供应链采购分佣 2023-03-16 10:55:52 +08:00
e50bb2ed63 完善小组提现 2023-03-15 17:29:18 +08:00
87e8cd3eec Merge branch 'develop' 2023-03-15 16:43:52 +08:00
9b3f2bb4ca Merge commit 'a111c728cf7c0d3f47d3356c96b384b01b2e06e0' 2023-03-15 16:43:38 +08:00
d3d8919654 小组佣金同步 2023-03-15 16:42:18 +08:00
a111c728cf 完善小组采购,商户、分佣财务记录 2023-03-15 16:38:51 +08:00
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