Commit Graph

20 Commits

Author SHA1 Message Date
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