 sangelxiu1
|
d1a4f364ca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 14:32:33 +08:00 |
|
sangelxiu1
|
401adc07e0
|
## Opt - mq补偿增加业绩
|
2025-06-13 14:32:27 +08:00 |
 cabbage
|
3f66820e55
|
## 奖金明细、奖金汇总接口调整；
|
2025-06-13 14:16:09 +08:00 |
|
cabbage
|
335befb3ca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 14:00:14 +08:00 |
|
cabbage
|
d50fa4085b
|
## 使用BigDecimalFormat注解，默认不用四舍五入改为去尾；
|
2025-06-13 14:00:08 +08:00 |
|
sangelxiu1
|
cf7924b143
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 13:52:59 +08:00 |
|
sangelxiu1
|
e0921965a7
|
## Opt - 我的->盒数
业绩除万,四位小数
|
2025-06-13 13:52:53 +08:00 |
|
cabbage
|
01606f64bd
|
## 计算平级时，保留6位小数；
|
2025-06-13 13:24:59 +08:00 |
|
cabbage
|
1d31ef09a5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 12:02:57 +08:00 |
|
cabbage
|
2411a8d22c
|
## 查询昨日奖金汇总接口；
|
2025-06-13 12:02:53 +08:00 |
|
sangelxiu1
|
8d3408c421
|
## Opt - 我的->盒数
增加激活时间判断 & 计算达小区时包含注水,返回前台数据时剔出注水
|
2025-06-13 12:02:06 +08:00 |
|
sangelxiu1
|
ac6dc2c5cd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 11:41:17 +08:00 |
|
sangelxiu1
|
3d3d250305
|
## Fix - 新用户后台改等级 没有日结造成npe
|
2025-06-13 11:41:11 +08:00 |
|
cabbage
|
3cc33fe23f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 10:44:15 +08:00 |
|
cabbage
|
ae81f09aa5
|
## 后台办理业务手动激活推送秒结状态MQ；
|
2025-06-13 10:44:11 +08:00 |
|
sangelxiu1
|
b7b487a7d4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 10:39:55 +08:00 |
|
sangelxiu1
|
4d5e592019
|
## Feat - 新增秒结补偿MQ逻辑
查当前ID伞下秒结表的sum(NEW_BOX_NUM)更新至当前用户的TEAM_NEW_BOX_NUM
|
2025-06-13 10:39:49 +08:00 |
|
cabbage
|
f5b00b773e
|
## 后台办理业务手动激活推送秒结状态MQ；
|
2025-06-13 10:38:50 +08:00 |
|
cabbage
|
b32e00d74e
|
## 升级订单添加激活MQ推送；
|
2025-06-13 09:59:30 +08:00 |
|
sangelxiu1
|
b728f56575
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-13 09:35:20 +08:00 |
|
sangelxiu1
|
e5358217a4
|
## Feat - 新增秒结补偿MQ定义
|
2025-06-13 09:35:13 +08:00 |
|
cabbage
|
8363daf3b9
|
## get-info返回是否激活；
|
2025-06-13 09:21:19 +08:00 |
woody
|
3a7ff8afb0
|
feat(MemberEmptyService): 空单注册不校验手机号
|
2025-06-13 09:03:12 +08:00 |
|
cabbage
|
957dc0f8a4
|
## 结算时处理手动激活的数据处理；
|
2025-06-12 20:39:15 +08:00 |
|
sangelxiu1
|
c921750b2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-12 20:27:25 +08:00 |
|
sangelxiu1
|
b62724a7e6
|
## Fix - 查询区域偶发带分页&查询会员盒数
|
2025-06-12 20:27:19 +08:00 |
|
cabbage
|
97b828b4b9
|
## 秒结、日结处理会员激活状态；
|
2025-06-12 17:03:38 +08:00 |
|
sangelxiu1
|
f4c6516e10
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-12 15:34:59 +08:00 |
|
sangelxiu1
|
4dc8f43fe5
|
## Fix - 短信模版ID
|
2025-06-12 15:34:53 +08:00 |
|
cabbage
|
bbb91a7428
|
## 直推收益、平级收益处理；
|
2025-06-12 15:22:38 +08:00 |
|
sangelxiu1
|
cd3c17c6dc
|
## Opt - 重构统计盒数逻辑
|
2025-06-12 14:37:33 +08:00 |
|
cabbage
|
4bca022430
|
## 直推收益、平级收益处理；
|
2025-06-12 14:29:05 +08:00 |
|
cabbage
|
684ecdb098
|
## 区域收益改为商品价格的5%；盒数大小区计算调整；秒结计算等级以会员表关系为主查询；
|
2025-06-12 13:28:52 +08:00 |
|
woody
|
1c77821a24
|
feat(CuMember): 直推列表添加手机号字段
|
2025-06-12 09:06:25 +08:00 |
|
cabbage
|
afe5a82e6e
|
## 注册、升级、复购、重消订单业绩、盒数都算自己小区；
|
2025-06-11 19:30:13 +08:00 |
|
cabbage
|
816aa2fdb6
|
## 升级订单等级计算处理；
|
2025-06-11 16:56:37 +08:00 |
|
cabbage
|
68827b97f2
|
## 撤单激活处理（168）；
|
2025-06-11 16:28:57 +08:00 |
|
cabbage
|
e8bba0ae80
|
## 门票价格显示（169）；
|
2025-06-11 16:25:55 +08:00 |
|
cabbage
|
a687acd4f3
|
## 注册成功返回地址；
|
2025-06-11 16:20:17 +08:00 |
|
cabbage
|
78c9b8d038
|
## 升级方式改为一次性补差升级；
|
2025-06-11 16:11:50 +08:00 |
|
cabbage
|
5cedaa4f2e
|
## 撤单处理盒数、业绩等；
|
2025-06-11 15:39:32 +08:00 |
|
cabbage
|
9289057d55
|
## 奖金项调整；
|
2025-06-11 15:38:36 +08:00 |
|
sangelxiu1
|
eb34a8eea9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-11 14:38:46 +08:00 |
|
sangelxiu1
|
279a17cf1e
|
## Opt - 选择收益区域
|
2025-06-11 14:38:39 +08:00 |
|
cabbage
|
190c8b3c9d
|
## 处理语句报错；
|
2025-06-11 14:03:39 +08:00 |
|
cabbage
|
ffc688d029
|
## 区域分红收益处理；
|
2025-06-11 13:49:11 +08:00 |
|
cabbage
|
75ad4f97a3
|
## 报单时激活判断调整；还原指定商品盒数累计；
|
2025-06-11 11:57:21 +08:00 |
|
cabbage
|
622a066e0f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-11 11:05:29 +08:00 |
|
cabbage
|
438f4b2cf3
|
## 调整生成奖金索引；
|
2025-06-11 11:05:25 +08:00 |
|
sangelxiu1
|
7f031633f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-10 20:34:00 +08:00 |