 cabbage
|
49e4d71418
|
## 月度分红处理时，不激活的不计算奖金；
|
2025-06-30 09:27:52 +08:00 |
|
cabbage
|
caf6cbe158
|
## 奖金来源、奖金汇总、奖金明细添加培训津贴返回以及导出；
|
2025-06-27 11:45:08 +08:00 |
|
cabbage
|
ca7a6821b3
|
## 日结处理荣誉奖衔；
|
2025-06-27 11:44:59 +08:00 |
|
cabbage
|
3bbdd77cce
|
## 培育津贴；
|
2025-06-27 09:47:56 +08:00 |
|
cabbage
|
4828ded5bb
|
## 去掉奖金没用的实体；
|
2025-06-27 09:47:54 +08:00 |
|
cabbage
|
430e89184c
|
## 去掉不用的4-N等老奖金处理；去掉荣誉墙、推荐达人等；
|
2025-06-27 09:47:52 +08:00 |
|
cabbage
|
bfe200735d
|
## 复购级差收益处理修改；
|
2025-06-25 16:57:55 +08:00 |
|
cabbage
|
14cb2bc9e6
|
## 去掉结算中关于奖衔相关处理；
|
2025-06-25 16:22:51 +08:00 |
|
cabbage
|
fdacb2243a
|
## 去掉部分不需要的实体及注释；
|
2025-06-25 15:15:32 +08:00 |
|
cabbage
|
7e8e515adf
|
## 奖金来源、奖金明细显示以及导出调整；
|
2025-06-25 15:15:32 +08:00 |
|
cabbage
|
f76b08edf5
|
## 前台会员明细返回；
|
2025-06-23 17:59:15 +08:00 |
|
cabbage
|
affbb04222
|
## 奖金明细、奖金来源新奖金字段；
|
2025-06-23 17:59:15 +08:00 |
|
cabbage
|
c0d2e49b87
|
## 月度分红处理；
|
2025-06-23 17:59:14 +08:00 |
|
cabbage
|
a5c2147cbe
|
## 月奖月度级差、复购级差；
|
2025-06-23 11:58:42 +08:00 |
|
cabbage
|
f1264dd994
|
## 分红奖衔秒结处理；
|
2025-06-20 17:07:44 +08:00 |
|
cabbage
|
bacedcfd33
|
## 秒结、日结恢复分红奖衔；
|
2025-06-19 16:09:22 +08:00 |
|
cabbage
|
70dc1fcf46
|
## 处理业绩表方法；
|
2025-06-18 10:45:03 +08:00 |
|
cabbage
|
2d51c2b60b
|
## 处理业绩表方法；
|
2025-06-17 17:34:38 +08:00 |
|
cabbage
|
b371c4e4b3
|
## 等级修改、0元注册、删除空点相关接口调整；
|
2025-06-17 17:29:12 +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
|
d3b16858c3
|
## 奖衔处理全部改为逻辑删除和查询；
|
2025-06-16 10:10:15 +08:00 |
|
cabbage
|
c1c90edab8
|
## 复购商品区域分红按指定的价格进行处理；
|
2025-06-13 18:27:58 +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
|
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
|
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
|
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
|
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 |