 wangw
|
a3ee3031ee
|
重置分销组 标识
|
2025-10-29 11:42:21 +08:00 |
|
wangw
|
ddf97b138a
|
重置分销组
|
2025-10-29 11:38:58 +08:00 |
|
wangw
|
dc96552896
|
重置分销组
|
2025-10-29 11:30:30 +08:00 |
|
wangw
|
f8788a7786
|
重置分销组
|
2025-10-29 11:16:44 +08:00 |
|
wangw
|
fae7d9ed5d
|
额外字段
|
2025-10-28 18:13:50 +08:00 |
|
wangw
|
4a65b4a2c2
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 18:01:37 +08:00 |
|
wangw
|
3fbafafcf4
|
排序
|
2025-10-28 18:01:28 +08:00 |
张松
|
4675910f77
|
分销完善
|
2025-10-28 17:59:58 +08:00 |
|
wangw
|
2212e1d14c
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 17:49:38 +08:00 |
|
wangw
|
faac76cc33
|
邀请人列表
|
2025-10-28 17:49:27 +08:00 |
|
张松
|
655b545bdb
|
分销完善
|
2025-10-28 17:44:19 +08:00 |
|
wangw
|
618286703e
|
邀请人列表
|
2025-10-28 17:40:35 +08:00 |
|
张松
|
c199711e4d
|
用户分账余额记录接口
|
2025-10-28 16:39:53 +08:00 |
|
张松
|
5f78e3e0c2
|
商家余额记录接口
|
2025-10-28 15:59:16 +08:00 |
|
wangw
|
fc7ebf5922
|
集合返回4
|
2025-10-28 15:35:01 +08:00 |
|
wangw
|
95a9d30e78
|
集合返回3
|
2025-10-28 15:25:47 +08:00 |
|
wangw
|
1562554160
|
集合返回
|
2025-10-28 15:19:18 +08:00 |
|
wangw
|
e3236d47a9
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 15:09:19 +08:00 |
|
wangw
|
e99125725f
|
店铺Id
|
2025-10-28 15:09:12 +08:00 |
|
张松
|
30c513d71d
|
分销二维码接口
|
2025-10-28 15:03:58 +08:00 |
|
张松
|
b355cd0ba7
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 14:56:18 +08:00 |
|
张松
|
993b65caae
|
分销充值修改
|
2025-10-28 14:56:11 +08:00 |
|
wangw
|
6b726bbb35
|
邀请人列表
|
2025-10-28 14:54:38 +08:00 |
|
wangw
|
e2103d4d0d
|
邀请人列表
|
2025-10-28 14:51:09 +08:00 |
|
张松
|
0ef7e2643e
|
分销修改
|
2025-10-28 14:43:55 +08:00 |
|
张松
|
ff32ec71c1
|
分销修改
|
2025-10-28 14:22:05 +08:00 |
|
wangw
|
1b47bdd8f3
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 14:12:36 +08:00 |
|
wangw
|
4c7cc285ea
|
绑定上级
|
2025-10-28 14:12:19 +08:00 |
|
张松
|
708f939917
|
分销修改
|
2025-10-28 14:05:34 +08:00 |
|
张松
|
70679110e2
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 14:04:18 +08:00 |
|
张松
|
1faf6cccbb
|
分销修改
|
2025-10-28 14:04:10 +08:00 |
|
wangw
|
16f357f78e
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 14:03:54 +08:00 |
|
wangw
|
0bb5214696
|
绑定上级
|
2025-10-28 14:03:43 +08:00 |
|
张松
|
0b6a54b914
|
分销修改
|
2025-10-28 14:03:40 +08:00 |
|
张松
|
ea1c656034
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 13:42:32 +08:00 |
|
张松
|
4b8fc8a15c
|
分销修改
|
2025-10-28 13:42:24 +08:00 |
|
wangw
|
7762a5bc36
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-28 13:41:54 +08:00 |
|
wangw
|
de02f98141
|
shopUser 增加 是否是分销员的标识
会员等级
|
2025-10-28 13:41:45 +08:00 |
|
张松
|
acd952a8a1
|
分销等级
|
2025-10-28 11:44:27 +08:00 |
|
张松
|
11c3b4f178
|
分销等级
|
2025-10-28 11:42:39 +08:00 |
|
wangw
|
9b4354ae70
|
分销员使用 shopUser主键ID
|
2025-10-28 11:27:27 +08:00 |
|
wangw
|
0d2a930ae8
|
限时折扣 与会员价
|
2025-10-28 11:16:19 +08:00 |
|
wangw
|
da7ddb8128
|
分销员
|
2025-10-28 09:26:44 +08:00 |
|
wangw
|
94fd4fc34d
|
总收益 待入账
|
2025-10-27 21:36:58 +08:00 |
|
wangw
|
618374564e
|
id
|
2025-10-27 21:26:24 +08:00 |
|
wangw
|
9881299f64
|
计算金额 类型问题3
|
2025-10-27 21:25:11 +08:00 |
|
wangw
|
316b618e24
|
计算金额 类型问题
|
2025-10-27 21:21:30 +08:00 |
|
wangw
|
b4cba628d4
|
计算金额
|
2025-10-27 21:18:48 +08:00 |
|
张松
|
fb191b0539
|
分销员开通
|
2025-10-27 21:10:41 +08:00 |
|
张松
|
eb7f4824d2
|
分销员开通
|
2025-10-27 21:06:39 +08:00 |
|
张松
|
292f799820
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 20:53:13 +08:00 |
|
张松
|
1f8b2cba50
|
分账提现接口
|
2025-10-27 20:53:06 +08:00 |
|
wangw
|
abca38dd53
|
绑定邀请人
|
2025-10-27 20:52:22 +08:00 |
|
张松
|
d8171cfb75
|
分账提现接口
|
2025-10-27 20:38:06 +08:00 |
|
wangw
|
078b8d1c5d
|
分销员中心-实名认证
绑定邀请人
分销员:获取下级分销员分页列表
分销员:获取邀请人分页列表
|
2025-10-27 20:29:52 +08:00 |
|
张松
|
aed955c513
|
分账提现接口
|
2025-10-27 20:11:52 +08:00 |
|
张松
|
1560e5a36f
|
分账提现接口
|
2025-10-27 19:48:30 +08:00 |
|
wangw
|
3c2af59c4c
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 19:37:29 +08:00 |
|
wangw
|
33e2a12618
|
分销员中心-配置信息
|
2025-10-27 19:37:23 +08:00 |
|
张松
|
cf492b32f1
|
订单分账处理
|
2025-10-27 19:22:10 +08:00 |
|
wangw
|
30f35128fd
|
shopUser关联shopId
|
2025-10-27 19:03:47 +08:00 |
|
wangw
|
670446215a
|
空值校验
|
2025-10-27 18:57:25 +08:00 |
|
wangw
|
a1c8f649ff
|
限时折扣 计算
|
2025-10-27 18:48:47 +08:00 |
|
wangw
|
fed18330b5
|
限时折扣
|
2025-10-27 18:45:31 +08:00 |
|
wangw
|
4d6cac0e1f
|
判空
|
2025-10-27 18:40:32 +08:00 |
|
张松
|
58f9622656
|
分校明细
|
2025-10-27 18:16:38 +08:00 |
|
wangw
|
827cc937e1
|
满减金额 增加餐位费和打包费
|
2025-10-27 16:58:50 +08:00 |
|
wangw
|
49755e6354
|
配置中心
|
2025-10-27 16:51:20 +08:00 |
|
张松
|
e6ad8baeeb
|
回调分销实现
|
2025-10-27 16:33:13 +08:00 |
|
张松
|
b73ca2c6e7
|
回调分销实现
|
2025-10-27 16:28:14 +08:00 |
|
张松
|
bf083f698e
|
分销分钱具体逻辑
|
2025-10-27 16:00:58 +08:00 |
|
张松
|
39984116d0
|
shopInfo调整
|
2025-10-27 14:35:06 +08:00 |
|
wangw
|
5b9ddbe91c
|
重复依赖
|
2025-10-27 14:22:27 +08:00 |
|
wangw
|
00cbb7bc4f
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 14:17:45 +08:00 |
|
wangw
|
9ec1f7c175
|
重复依赖
|
2025-10-27 14:17:37 +08:00 |
|
张松
|
39b8ecb575
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionConfigService.java
# cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionConfigServiceImpl.java
|
2025-10-27 14:13:47 +08:00 |
|
张松
|
249c6b4a6e
|
运营端充值
|
2025-10-27 14:12:49 +08:00 |
|
wangw
|
7c18e80c88
|
循环依赖
|
2025-10-27 14:09:31 +08:00 |
|
wangw
|
6118711919
|
分销员
|
2025-10-27 13:55:14 +08:00 |
|
张松
|
bd529b2425
|
运营端充值
|
2025-10-27 13:48:19 +08:00 |
|
张松
|
7bb6198798
|
运营端充值
|
2025-10-27 13:43:26 +08:00 |
|
张松
|
423b6f303f
|
分销员开通接口
|
2025-10-27 11:38:08 +08:00 |
|
wangw
|
a4c77c2403
|
分销员表
|
2025-10-27 11:18:13 +08:00 |
|
wangw
|
3ee1e1efbf
|
分销员表
|
2025-10-27 11:17:48 +08:00 |
|
wangw
|
2d0d9ba573
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 10:59:34 +08:00 |
|
wangw
|
7fa139e6fb
|
整单金额
|
2025-10-27 10:59:16 +08:00 |
|
张松
|
de7236f624
|
分销后台相关接口 现金充值 记录明细
|
2025-10-27 10:47:22 +08:00 |
|
wangw
|
c943a77a27
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 10:38:37 +08:00 |
|
wangw
|
f77d8c216e
|
shopUser 接口
|
2025-10-27 10:38:24 +08:00 |
|
张松
|
8fd22fb1d8
|
分销后台相关接口 现金充值 记录明细
|
2025-10-27 10:38:08 +08:00 |
|
张松
|
57ef7f91a1
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 10:31:19 +08:00 |
|
张松
|
ac002cb1dd
|
分销后台相关接口 现金充值 记录明细
|
2025-10-27 10:31:09 +08:00 |
|
wangw
|
f1341b8c7f
|
限时折扣 优先级
|
2025-10-27 09:24:31 +08:00 |
|
wangw
|
d685d437aa
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-27 09:24:07 +08:00 |
|
wangw
|
4b08359ddd
|
会员价 判空
|
2025-10-27 09:09:28 +08:00 |
|
张松
|
3fd64d4806
|
分销后台相关接口
|
2025-10-25 10:21:50 +08:00 |
|
张松
|
1d153a2c4d
|
店铺会员返回会员折扣信息
|
2025-10-24 18:21:02 +08:00 |
|
wangw
|
fa868f6414
|
乱七八糟折扣计算
|
2025-10-24 15:59:20 +08:00 |
|
wangw
|
69c0de7651
|
Merge remote-tracking branch 'origin/test' into test
|
2025-10-24 15:41:01 +08:00 |
|
wangw
|
56dfdcd523
|
乱七八糟折扣计算 不包括会员整单折扣
|
2025-10-24 15:40:51 +08:00 |