cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6db021e8b0
								
							
						 | 
						
							
							
								
								## 日结处理业绩;
							
							
							
							
							
						 | 
						
							2025-09-26 17:55:40 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								ca9890ad4c
								
							
						 | 
						
							
							
								
								## Opt - 秒结-甄选数据算在注册专区
							
							
							
							
							
						 | 
						
							2025-09-26 16:46:31 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								1fea92b74b
								
							
						 | 
						
							
							
								
								## 赠点如果直推下没有可以填充的,则按血缘上逻辑走;
							
							
							
							
							
						 | 
						
							2025-09-26 15:20:18 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a41cd10d4d
								
							
						 | 
						
							
							
								
								## 赠点激活阶段填充处理;
							
							
							
							
							
						 | 
						
							2025-09-26 14:56:13 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								02ff3cd355
								
							
						 | 
						
							
							
								
								## 二三阶段数据补全;
							
							
							
							
							
						 | 
						
							2025-09-25 18:08:07 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								34903b0b00
								
							
						 | 
						
							
							
								
								## 三阶段奖金发放点位数处理;
							
							
							
							
							
						 | 
						
							2025-09-25 18:08:02 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								9a563f0c09
								
							
						 | 
						
							
							
								
								## Opt - 奖金来源
							
							
							
							
							
						 | 
						
							2025-09-25 14:59:29 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e6f247670e
								
							
						 | 
						
							
							
								
								## 三阶段奖金处理;
							
							
							
							
							
						 | 
						
							2025-09-25 14:06:03 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								97a5e59239
								
							
						 | 
						
							
							
								
								## 三阶段奖金生成;
							
							
							
							
							
						 | 
						
							2025-09-25 14:06:01 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								413db854cb
								
							
						 | 
						
							
							
								
								## 三阶段奖金生成;
							
							
							
							
							
						 | 
						
							2025-09-25 14:05:59 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								a6532f8a8f
								
							
						 | 
						
							
							
								
								## Opt - 奖金汇总
							
							
							
							
							
						 | 
						
							2025-09-25 14:05:56 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6325679655
								
							
						 | 
						
							
							
								
								## Opt - 奖金来源调整来源ID的逻辑&奖金明细
							
							
							
							
							
						 | 
						
							2025-09-25 10:34:43 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								91fac644d3
								
							
						 | 
						
							
							
								
								## 阶段收益添加来源会员;
							
							
							
							
							
						 | 
						
							2025-09-25 09:48:58 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f50645d5ab
								
							
						 | 
						
							
							
								
								## 兼容三阶段部分点位为空以及收益处理订单为空;
							
							
							
							
							
						 | 
						
							2025-09-25 09:48:58 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								637aca701d
								
							
						 | 
						
							
							
								
								## 每日点位总数处理;添加三阶段奖金发放记录字段;
							
							
							
							
							
						 | 
						
							2025-09-24 19:06:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								05f57a36ca
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test
							
							
							
							
							
							
							
							# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.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/bonus/dto/BonusStageData.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.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/CuMemberBonusServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.java
#	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/bonus/CuMemberBonusStageMapper.xml
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
#	bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java
#	bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java
#	bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
#	bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml 
							
						 | 
						
							2025-09-24 18:04:19 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								86b7208d3d
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-24 18:00:41 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								bacbb61168
								
							
						 | 
						
							
							
								
								## 一二三阶段填充点位数据;一二阶段奖金计算;
							
							
							
							
							
						 | 
						
							2025-09-24 18:00:36 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								edb598878e
								
							
						 | 
						
							
							
								
								## Opt - 奖金来源 增加阶段收益部分
							
							
							
							
							
						 | 
						
							2025-09-24 17:55:12 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6a4429ca68
								
							
						 | 
						
							
							
								
								## 日结结束调用业绩汇总;
							
							
							
							
							
						 | 
						
							2025-09-23 12:00:25 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								8642d1aca3
								
							
						 | 
						
							
							
								
								## 一阶段结算入库;
							
							
							
							
							
						 | 
						
							2025-09-22 19:25:48 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								817bca7553
								
							
						 | 
						
							
							
								
								## Opt - 秒结MQ(下单/撤单)
							
							
							
							
							
						 | 
						
							2025-09-22 19:25:46 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								9868e5fabb
								
							
						 | 
						
							
							
								
								## 日结明细唯一索引调整;
							
							
							
							
							
						 | 
						
							2025-09-22 19:25:35 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7a5bc55ddf
								
							
						 | 
						
							
							
								
								## 一阶段结算入库;
							
							
							
							
							
						 | 
						
							2025-09-22 19:24:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								460a6e1d02
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-22 16:35:48 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ae08bd578c
								
							
						 | 
						
							
							
								
								## 日结明细唯一索引调整;
							
							
							
							
							
						 | 
						
							2025-09-22 16:35:44 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b87a934971
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-22 16:26:22 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								800d9db8fa
								
							
						 | 
						
							
							
								
								## Opt - 秒结MQ(下单/撤单)
							
							
							
							
							
						 | 
						
							2025-09-22 16:26:15 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								48863d8dc7
								
							
						 | 
						
							
							
								
								## 一阶段填充点位逻辑调整;
							
							
							
							
							
						 | 
						
							2025-09-22 15:49:41 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a518eb8775
								
							
						 | 
						
							
							
								
								## 阶段收益入库操作;封装阶段收益使用备注等;
							
							
							
							
							
						 | 
						
							2025-09-22 15:49:41 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								abe46ad69e
								
							
						 | 
						
							
							
								
								## 一阶段填充点位逻辑调整;
							
							
							
							
							
						 | 
						
							2025-09-22 15:49:15 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e3fae413a6
								
							
						 | 
						
							
							
								
								## 阶段收益入库操作;封装阶段收益使用备注等;
							
							
							
							
							
						 | 
						
							2025-09-21 10:47:40 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								30572dc242
								
							
						 | 
						
							
							
								
								## 结算表初始化新字段;日数据如果为空不执行插入;
							
							
							
							
							
						 | 
						
							2025-09-21 09:52:15 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								656f6278eb
								
							
						 | 
						
							
							
								
								## 结算表初始化新字段;日数据如果为空不执行插入;
							
							
							
							
							
						 | 
						
							2025-09-21 09:51:08 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3b89fd6ca1
								
							
						 | 
						
							
							
								
								## 一阶段点位填充处理;
							
							
							
							
							
						 | 
						
							2025-09-19 18:15:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								647be8bb87
								
							
						 | 
						
							
							
								
								## 前缀更新为ZK;日结、日结明细表初始化;
							
							
							
							
							
						 | 
						
							2025-09-19 18:15:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								d34b279ce0
								
							
						 | 
						
							
							
								
								## Opt - 反射按顺序规则填充CuMemberRetailDetail
							
							
							
							
							
						 | 
						
							2025-09-19 18:15:32 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f88ccb7cb8
								
							
						 | 
						
							
							
								
								## 阶段奖金计算处理(未完成);
							
							
							
							
							
						 | 
						
							2025-09-19 18:15:31 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								bcc4cfed88
								
							
						 | 
						
							
							
								
								## 一阶段点位填充处理;
							
							
							
							
							
						 | 
						
							2025-09-19 18:14:50 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2fb7a7aa43
								
							
						 | 
						
							
							
								
								## 前缀更新为ZK;日结、日结明细表初始化;
							
							
							
							
							
						 | 
						
							2025-09-19 10:50:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								f45a4f3e23
								
							
						 | 
						
							
							
								
								## Opt - 反射按顺序规则填充CuMemberRetailDetail
							
							
							
							
							
						 | 
						
							2025-09-18 17:25:42 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c37e19f473
								
							
						 | 
						
							
							
								
								## 阶段奖金计算处理(未完成);
							
							
							
							
							
						 | 
						
							2025-09-18 16:56:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e70a9e0179
								
							
						 | 
						
							
							
								
								## 精品专区直推收益;商城专区见点收益;商品基础规格等配置去掉缓存;去掉部分不需要代码和枚举;
							
							
							
							
							
						 | 
						
							2025-09-18 14:19:08 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								900129db57
								
							
						 | 
						
							
							
								
								## 精品专区直推收益;商城专区见点收益;商品基础规格等配置去掉缓存;去掉部分不需要代码和枚举;
							
							
							
							
							
						 | 
						
							2025-09-18 14:18:20 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6267b5fb07
								
							
						 | 
						
							
							
								
								## 每天创建结算明细表;
							
							
							
							
							
						 | 
						
							2025-09-17 13:52:05 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								464868338f
								
							
						 | 
						
							
							
								
								## Opt - 迁移分享注册流程
							
							
							
							
							
						 | 
						
							2025-09-17 13:52:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								97205a139d
								
							
						 | 
						
							
							
								
								## 去掉原复购级差;添加会员日结明细;
							
							
							
							
							
						 | 
						
							2025-09-17 13:51:58 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								158c5e8a9b
								
							
						 | 
						
							
							
								
								## 每天创建结算明细表;
							
							
							
							
							
						 | 
						
							2025-09-17 13:49:51 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								8b52bbb00f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-09-16 17:07:27 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								5c2b8e6562
								
							
						 | 
						
							
							
								
								## Opt - 迁移分享注册流程
							
							
							
							
							
						 | 
						
							2025-09-16 17:07:19 +08:00 |