 cabbage
|
3b104b5554
|
## 判断升级时，添加本身注水盒数处理；
|
2025-06-17 13:22:11 +08:00 |
|
cabbage
|
ea0a7d82bc
|
## 调整等级判断处理，注水单独处理；
|
2025-06-17 11:26:27 +08:00 |
|
cabbage
|
394b6dad10
|
## 日结添加团队月盒数字段及处理；月奖查询订单不走dubbo服务，改为自查询；
|
2025-06-17 10:47:16 +08:00 |
|
cabbage
|
8b4cbffe54
|
## 更新奖衔语句问题处理；
|
2025-06-16 15:00:41 +08:00 |
|
cabbage
|
03670dd588
|
## 更新奖衔语句问题处理；
|
2025-06-16 14:52:30 +08:00 |
|
cabbage
|
12d1f724c9
|
## 等级处理改为逻辑删除；
|
2025-06-16 10:10:21 +08:00 |
|
cabbage
|
060f93a006
|
## 自己月累计业绩处理；
|
2025-06-16 10:10:17 +08:00 |
|
cabbage
|
d3b16858c3
|
## 奖衔处理全部改为逻辑删除和查询；
|
2025-06-16 10:10:15 +08:00 |
|
cabbage
|
e3600d8e76
|
## 计算会员等级直推会员不算注水；奖金公布接口调整；
|
2025-06-14 09:48:05 +08:00 |
|
cabbage
|
c1c90edab8
|
## 复购商品区域分红按指定的价格进行处理；
|
2025-06-13 18:27:58 +08:00 |
|
cabbage
|
ca0321a43a
|
## 累积盒数处理循环修改；
|
2025-06-13 18:27:58 +08:00 |
|
cabbage
|
7df34fac00
|
## 奖金明细去掉分页；
|
2025-06-13 16:04:47 +08:00 |
|
cabbage
|
b9eb35f130
|
## 平级收益价格按单商品处理；
|
2025-06-13 14:34:14 +08:00 |
 sangelxiu1
|
147e28fbf6
|
## Opt - mq补偿增加业绩
|
2025-06-13 14:34:13 +08:00 |
|
sangelxiu1
|
dc4681cd3b
|
## Opt - mq补偿增加业绩
|
2025-06-13 14:34:12 +08:00 |
|
cabbage
|
8eebb3fdfa
|
## 奖金明细、奖金汇总接口调整；
|
2025-06-13 14:22:05 +08:00 |
|
cabbage
|
c589c2461c
|
## 计算平级时，保留6位小数；
|
2025-06-13 14:22:00 +08:00 |
|
cabbage
|
99317636cc
|
## 查询昨日奖金汇总接口；
|
2025-06-13 14:21:58 +08:00 |
|
sangelxiu1
|
fea41d6ccd
|
## Opt - 我的->盒数
增加激活时间判断 & 计算达小区时包含注水,返回前台数据时剔出注水
|
2025-06-13 14:21:56 +08:00 |
|
sangelxiu1
|
1f8d4a2b50
|
## Feat - 新增秒结补偿MQ逻辑
查当前ID伞下秒结表的sum(NEW_BOX_NUM)更新至当前用户的TEAM_NEW_BOX_NUM
|
2025-06-13 14:17:06 +08:00 |
|
cabbage
|
dcead29539
|
## 后台办理业务手动激活推送秒结状态MQ；
|
2025-06-13 14:17:04 +08:00 |
|
cabbage
|
849f8e6128
|
## 结算时处理手动激活的数据处理；
|
2025-06-12 20:40:22 +08:00 |
|
cabbage
|
c95d15489b
|
## 秒结、日结处理会员激活状态；
|
2025-06-12 20:40:21 +08:00 |
|
cabbage
|
fe382acca8
|
## 直推收益、平级收益处理；
|
2025-06-12 15:23:13 +08:00 |
|
cabbage
|
ec0006a40c
|
## 直推收益、平级收益处理；
|
2025-06-12 15:23:12 +08:00 |
|
cabbage
|
564fb2bf12
|
## 区域收益改为商品价格的5%；盒数大小区计算调整；秒结计算等级以会员表关系为主查询；
|
2025-06-12 13:29:33 +08:00 |
|
cabbage
|
66973a5675
|
## 注册、升级、复购、重消订单业绩、盒数都算自己小区；
|
2025-06-11 19:30:51 +08:00 |
|
cabbage
|
5778ca1429
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-06-11 16:29:58 +08:00 |
|
cabbage
|
5cedaa4f2e
|
## 撤单处理盒数、业绩等；
|
2025-06-11 15:39:32 +08:00 |
|
cabbage
|
ffc688d029
|
## 区域分红收益处理；
|
2025-06-11 13:49:11 +08:00 |
|
cabbage
|
2c7178172d
|
## 调整生成奖金索引；
|
2025-06-11 11:06:27 +08:00 |
|
cabbage
|
438f4b2cf3
|
## 调整生成奖金索引；
|
2025-06-11 11:05:25 +08:00 |
|
cabbage
|
424e0bd18c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
# bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailRangeServiceImpl.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberAchieveMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAwardsMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
# bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java
# bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwardsType.java
|
2025-06-10 20:32:18 +08:00 |
|
cabbage
|
7e20c1d0ed
|
## 秒结和日结中盒数、业绩上传处理；等级、奖衔计算处理；
|
2025-06-10 20:31:14 +08:00 |
|
cabbage
|
fdbe598eb4
|
## 秒结等级、奖衔处理，业绩、盒数上传处理；部分枚举替换；
|
2025-06-10 15:45:29 +08:00 |
|
cabbage
|
d69566eeef
|
## 秒结等级、奖衔处理，业绩、盒数上传处理；部分枚举替换；
|
2025-06-10 15:45:02 +08:00 |
|
cabbage
|
e635528d63
|
## 注册相关接口修改完善；
|
2025-06-09 15:12:43 +08:00 |
|
cabbage
|
691766da64
|
## 调整部分三方注释；
|
2025-06-09 09:53:29 +08:00 |
|
cabbage
|
07ffadeab0
|
## 调整部分代码逻辑；
|
2025-06-08 16:05:57 +08:00 |
|
cabbage
|
6095ec5e0e
|
## 初始化去掉部分不需要接口；
|
2025-06-06 16:50:22 +08:00 |
|
cabbage
|
2618a75292
|
## 初始化去掉部分不需要接口；
|
2025-06-06 10:29:15 +08:00 |
|
cabbage
|
670900d1d3
|
## 初始化调整；
|
2025-05-27 15:03:45 +08:00 |