cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b8e4402b78
								
							
						 | 
						
							
							
								
								## 新复购级差收益累计商品数量;
							
							
							
							
							
						 | 
						
							2025-07-10 14:29:51 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ed49bcf975
								
							
						 | 
						
							
							
								
								## 新复购级差收益累计商品数量;
							
							
							
							
							
						 | 
						
							2025-07-10 14:29:51 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7376415d2f
								
							
						 | 
						
							
							
								
								## 商品列表添加权限控制;
							
							
							
							
							
						 | 
						
							2025-07-10 14:29:19 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								dadd325016
								
							
						 | 
						
							
							
								
								## 新复购级差收益累计商品数量;
							
							
							
							
							
						 | 
						
							2025-07-10 13:56:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0f63dcc55c
								
							
						 | 
						
							
							
								
								## 新复购级差收益累计商品数量;
							
							
							
							
							
						 | 
						
							2025-07-10 13:55:37 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								19bee0f3b2
								
							
						 | 
						
							
							
								
								## 新复购级差判断类型调整;
							
							
							
							
							
						 | 
						
							2025-07-10 12:02:56 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3b1bbdccd8
								
							
						 | 
						
							
							
								
								## 新复购级差判断类型调整;
							
							
							
							
							
						 | 
						
							2025-07-10 12:02:01 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								8b4e309f8a
								
							
						 | 
						
							
							
								
								## 新复购级差枚举值转换处理;
							
							
							
							
							
						 | 
						
							2025-07-10 10:52:45 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ea99ec0bb5
								
							
						 | 
						
							
							
								
								## 商品盒数中间表支持小数盒数;
							
							
							
							
							
						 | 
						
							2025-07-10 10:52:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								158f26ec9d
								
							
						 | 
						
							
							
								
								## 商品盒数中间表支持小数盒数;
							
							
							
							
							
						 | 
						
							2025-07-10 10:52:44 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								18e072c3f2
								
							
						 | 
						
							
							
								
								## 添加体系奖项配置;
							
							
							
							
							
						 | 
						
							2025-07-10 10:52:41 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								d8df6a047d
								
							
						 | 
						
							
							
								
								## 新复购级差枚举值转换处理;
							
							
							
							
							
						 | 
						
							2025-07-10 10:51:07 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								407d3c02e9
								
							
						 | 
						
							
							
								
								## 商品盒数中间表支持小数盒数;
							
							
							
							
							
						 | 
						
							2025-07-10 10:09:37 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								1384c3ecd7
								
							
						 | 
						
							
							
								
								## 商品盒数中间表支持小数盒数;
							
							
							
							
							
						 | 
						
							2025-07-10 10:06:45 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								69d6b9eaa4
								
							
						 | 
						
							
							
								
								## Fix - 回调地址
							
							
							
							
							
						 | 
						
							2025-07-10 09:58:33 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								eb230f471c
								
							
						 | 
						
							
							
								
								## Fix - 回调地址
							
							
							
							
							
						 | 
						
							2025-07-10 09:55:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								7c30dd0041
								
							
						 | 
						
							
							
								
								## Fix - 支付回调地址&提现驳回返回金额
							
							
							
							
							
						 | 
						
							2025-07-10 09:46:21 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								1937ced88e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-10 09:45:42 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								3e686a7798
								
							
						 | 
						
							
							
								
								## Fix - 支付回调地址&提现驳回返回金额
							
							
							
							
							
						 | 
						
							2025-07-10 09:45:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								340c542657
								
							
						 | 
						
							
							
								
								## 添加体系奖项配置;
							
							
							
							
							
						 | 
						
							2025-07-10 09:45:32 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								d7b0faff60
								
							
						 | 
						
							
							
								
								## 没有配置会员复购级差权限校验修改;
							
							
							
							
							
						 | 
						
							2025-07-09 15:34:28 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								d9d74cc773
								
							
						 | 
						
							
							
								
								## 没有配置会员复购级差权限校验修改;
							
							
							
							
							
						 | 
						
							2025-07-09 15:34:07 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6e43b5c970
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test
							
							
							
							
							
						 | 
						
							2025-07-09 14:49:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								192be3ff98
								
							
						 | 
						
							
							
								
								## 复购级差会员显示字段权限调整;
							
							
							
							
							
						 | 
						
							2025-07-09 14:47:30 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								2f6ce5d97e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-09 13:49:42 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								04d0c20c77
								
							
						 | 
						
							
							
								
								## Feat - 退款驳回
							
							
							
							
							
						 | 
						
							2025-07-09 13:49:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b601cc4181
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into test
							
							
							
							
							
							
							
							# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml 
							
						 | 
						
							2025-07-09 11:50:46 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a5f41adab9
								
							
						 | 
						
							
							
								
								## 去除站点配置相关;
							
							
							
							
							
						 | 
						
							2025-07-09 11:49:34 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0dbc58f58b
								
							
						 | 
						
							
							
								
								## 特殊体系复购级差奖项;
							
							
							
							
							
						 | 
						
							2025-07-09 11:18:07 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e8d9cab955
								
							
						 | 
						
							
							
								
								## 去掉进销存相关内容;
							
							
							
							
							
						 | 
						
							2025-07-09 11:16:15 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								6116ad468c
								
							
						 | 
						
							
							
								
								## Feat - 新零售-支付
							
							
							
							
							
						 | 
						
							2025-07-09 11:02:15 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								613c8a8002
								
							
						 | 
						
							
							
								
								## Feat - 新零售-支付
							
							
							
							
							
						 | 
						
							2025-07-09 10:59:32 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								2044185ae3
								
							
						 | 
						
							
							
								
								## Feat - 支付依赖
							
							
							
							
							
						 | 
						
							2025-07-09 10:58:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								1b4e8b9d1b
								
							
						 | 
						
							
							
								
								## 会员升级奖衔处理优化;
							
							
							
							
							
						 | 
						
							2025-07-07 15:46:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								262066c6df
								
							
						 | 
						
							
							
								
								## 添加日志;调整订单类型判断位置;
							
							
							
							
							
						 | 
						
							2025-07-07 15:46:36 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								d9e9589d70
								
							
						 | 
						
							
							
								
								## 会员升级奖衔处理优化;
							
							
							
							
							
						 | 
						
							2025-07-07 15:44:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								dec97f793e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-07 10:43:11 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								75380f03d7
								
							
						 | 
						
							
							
								
								## 添加日志;调整订单类型判断位置;
							
							
							
							
							
						 | 
						
							2025-07-07 10:43:06 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								fcee5cb16e
								
							
						 | 
						
							
							
								
								## Opt - 空值验证
							
							
							
							
							
						 | 
						
							2025-07-05 10:18:28 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								23db6a8918
								
							
						 | 
						
							
							
								
								## Opt - 空值验证
							
							
							
							
							
						 | 
						
							2025-07-05 10:18:03 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								cdcb13f9a1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/test' into test
							
							
							
							
							
						 | 
						
							2025-07-05 09:57:05 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								48a5ee0440
								
							
						 | 
						
							
							
								
								## Opt - 空值验证
							
							
							
							
							
						 | 
						
							2025-07-05 09:56:53 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								0ef00695f8
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-07-05 09:56:32 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								4bef2feacd
								
							
						 | 
						
							
							
								
								## Opt - 空值验证
							
							
							
							
							
						 | 
						
							2025-07-05 09:56:26 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								757a574191
								
							
						 | 
						
							
							
								
								## 秒结兼容多送2级处理问题;
							
							
							
							
							
						 | 
						
							2025-07-04 18:29:31 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								8eb6ee8586
								
							
						 | 
						
							
							
								
								## 秒结兼容多送2级处理问题;
							
							
							
							
							
						 | 
						
							2025-07-04 18:29:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3eae83f56b
								
							
						 | 
						
							
							
								
								## 新零售京东支付配置;
							
							
							
							
							
						 | 
						
							2025-07-04 15:26:43 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								96d7e1d213
								
							
						 | 
						
							
							
								
								## 分红奖衔处理调整;
							
							
							
							
							
						 | 
						
							2025-07-04 14:53:40 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								f2f9e0ac22
								
							
						 | 
						
							
							
								
								## 分红奖衔处理调整;
							
							
							
							
							
						 | 
						
							2025-07-04 14:53:10 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6f928a4dbd
								
							
						 | 
						
							
							
								
								## 撤单秒结盒数、业绩应该扣减;
							
							
							
							
							
						 | 
						
							2025-07-04 11:16:15 +08:00 |