cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								232edd3706
								
							
						 | 
						
							
							
								
								## 培育津贴;
							
							
							
							
							
						 | 
						
							2025-06-27 09:19:20 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ae1d6a3ce1
								
							
						 | 
						
							
							
								
								## 去掉奖金没用的实体;
							
							
							
							
							
						 | 
						
							2025-06-26 15:08:43 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								5b920ff44f
								
							
						 | 
						
							
							
								
								## 去掉不用的4-N等老奖金处理;去掉荣誉墙、推荐达人等;
							
							
							
							
							
						 | 
						
							2025-06-26 10:00:16 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								ecbf6d85cb
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-25 17:58:49 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								5202702654
								
							
						 | 
						
							
							
								
								## 手动开通V1V2单独判断升级;
							
							
							
							
							
						 | 
						
							2025-06-25 17:58:19 +08:00 | 
						
					
				
					
						
							
							
								 
								woody
							
						 | 
						
							
							
							
							
							
								
							
							
								b1a9d9de0f
								
							
						 | 
						
							
							
								
								Merge branch 'dev' of 47.94.45.65:angelo/java-retail-app into dev
							
							
							
							
							
						 | 
						
							2025-06-25 17:48:23 +08:00 | 
						
					
				
					
						
							
							
								 
								woody
							
						 | 
						
							
							
							
							
							
								
							
							
								5b231b923d
								
							
						 | 
						
							
							
								
								feat(BdRegionVertexServiceImpl): 添加区域分组判断逻辑修复
							
							
							
							
							
						 | 
						
							2025-06-25 17:47:10 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								b75b462677
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-25 17:30:11 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								63c6b409a1
								
							
						 | 
						
							
							
								
								## Opt - 补充继承基类的sql
							
							
							
							
							
						 | 
						
							2025-06-25 17:30:06 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								03416320f4
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-25 16:54:43 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e7430e1bb9
								
							
						 | 
						
							
							
								
								## 复购级差收益处理修改;
							
							
							
							
							
						 | 
						
							2025-06-25 16:54:39 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								abfa5b5968
								
							
						 | 
						
							
							
								
								## Feat - 添加&修改体系,增加分组ID
							
							
							
							
							
						 | 
						
							2025-06-25 16:54:07 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								92c6f102e1
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-25 16:49:45 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								0771c26a6d
								
							
						 | 
						
							
							
								
								## Feat - 增加获取全部区域体系分组配置列表&体系列表增加绑定区域名称
							
							
							
							
							
						 | 
						
							2025-06-25 16:49:39 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7259fd7bd2
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-25 16:41:48 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3a52c2bc27
								
							
						 | 
						
							
							
								
								## 赠送等级之后可以继续购买升级;
							
							
							
							
							
						 | 
						
							2025-06-25 16:41:44 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								8138657903
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-25 16:30:01 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								4d14e33ea9
								
							
						 | 
						
							
							
								
								## Feat - 区域体系分组配置
							
							
							
							
							
						 | 
						
							2025-06-25 16:29:40 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a90d130371
								
							
						 | 
						
							
							
								
								## 去掉结算中关于奖衔相关处理;
							
							
							
							
							
						 | 
						
							2025-06-25 16:21:37 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6d19e27afb
								
							
						 | 
						
							
							
								
								## 赠送等级之后可以继续购买升级;
							
							
							
							
							
						 | 
						
							2025-06-25 16:21:00 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								e6a54d5b23
								
							
						 | 
						
							
							
								
								## 会员奖金明细福利分红返回字段调整;
							
							
							
							
							
						 | 
						
							2025-06-25 14:34:01 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								6b20e56630
								
							
						 | 
						
							
							
								
								## 去掉奖金查询不需要的方法;
							
							
							
							
							
						 | 
						
							2025-06-25 14:19:58 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								04cde3b30d
								
							
						 | 
						
							
							
								
								## 去掉部分不需要的实体及注释;
							
							
							
							
							
						 | 
						
							2025-06-25 13:56:04 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b4af4adb72
								
							
						 | 
						
							
							
								
								## 奖金来源、奖金明细显示以及导出调整;
							
							
							
							
							
						 | 
						
							2025-06-25 13:50:27 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a3c8957025
								
							
						 | 
						
							
							
								
								## 复购级差收益累计以及备注调整;
							
							
							
							
							
						 | 
						
							2025-06-25 11:34:16 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								c3d69d0b28
								
							
						 | 
						
							
							
								
								## 会员H5奖金明细月奖字段返回调整;
							
							
							
							
							
						 | 
						
							2025-06-25 11:08:41 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								aa2f880313
								
							
						 | 
						
							
							
								
								## 默认月结期间表取值调整;
							
							
							
							
							
						 | 
						
							2025-06-25 10:49:07 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								dc2c62cbb3
								
							
						 | 
						
							
							
								
								## 2025.06.25需求,因V1-V3注册、升级多送两级,非手动V3V4可以再购买升V5;
							
							
							
							
							
						 | 
						
							2025-06-25 10:23:35 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								c548652b0a
								
							
						 | 
						
							
							
								
								## Fix - 初始化
							
							
							
							
							
						 | 
						
							2025-06-24 10:03:15 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								a2577ddd97
								
							
						 | 
						
							
							
								
								## Fix - npe
							
							
							
							
							
						 | 
						
							2025-06-24 09:35:46 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3c0f8cfc97
								
							
						 | 
						
							
							
								
								## 前台会员明细返回;
							
							
							
							
							
						 | 
						
							2025-06-23 17:58:51 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a4c4a7c135
								
							
						 | 
						
							
							
								
								## 奖金明细、奖金来源新奖金字段;
							
							
							
							
							
						 | 
						
							2025-06-23 17:49:19 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								967e0e851d
								
							
						 | 
						
							
							
								
								## 月度分红处理;
							
							
							
							
							
						 | 
						
							2025-06-23 16:43:49 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								5e0d9f2ff4
								
							
						 | 
						
							
							
								
								## 调整发货方法;
							
							
							
							
							
						 | 
						
							2025-06-23 15:41:48 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								3f6ae948da
								
							
						 | 
						
							
							
								
								## 添加测试结算日志;
							
							
							
							
							
						 | 
						
							2025-06-23 14:24:32 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0854376e90
								
							
						 | 
						
							
							
								
								## 测试环境月结奖衔取当前期间;
							
							
							
							
							
						 | 
						
							2025-06-23 14:23:04 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								4a376e936b
								
							
						 | 
						
							
							
								
								## 发货导出模板字段调整;
							
							
							
							
							
						 | 
						
							2025-06-23 13:27:24 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								2731274f58
								
							
						 | 
						
							
							
								
								## 月奖月度级差、复购级差;
							
							
							
							
							
						 | 
						
							2025-06-23 11:58:10 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								0fb3074768
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-21 09:06:18 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								b3a12a62f0
								
							
						 | 
						
							
							
								
								## 计算分红奖衔时,自己消费的虚拟区也算一个区;
							
							
							
							
							
						 | 
						
							2025-06-21 09:06:07 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								1a083b499b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-20 18:15:21 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								c1bb43f3bd
								
							
						 | 
						
							
							
								
								## Opt - 增加修改结算等级->最高等级下进行奖衔初始化
							
							
							
							
							
						 | 
						
							2025-06-20 18:15:13 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								55f5e0523d
								
							
						 | 
						
							
							
								
								## 分红奖衔秒结处理;
							
							
							
							
							
						 | 
						
							2025-06-20 17:06:06 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								283b041012
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-19 17:40:38 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								724ff1ae61
								
							
						 | 
						
							
							
								
								## 分红奖衔撤单回退处理;
							
							
							
							
							
						 | 
						
							2025-06-19 17:40:34 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								01d77cdf10
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
						 | 
						
							2025-06-19 17:35:29 +08:00 | 
						
					
				
					
						
							
							
								
								 sangelxiu1
							
						 | 
						
							
							
							
							
							
								
							
							
								0bceaa15d8
								
							
						 | 
						
							
							
								
								## Opt - PageUtils.clearPage AOP
							
							
							
							
							
						 | 
						
							2025-06-19 17:35:23 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								17e5a70f85
								
							
						 | 
						
							
							
								
								## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理;
							
							
							
							
							
						 | 
						
							2025-06-19 16:06:30 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								7a17c2127e
								
							
						 | 
						
							
							
								
								## get-info返回分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 15:39:54 +08:00 | 
						
					
				
					
						
							
							
								
								 cabbage
							
						 | 
						
							
							
							
							
							
								
							
							
								a35e468103
								
							
						 | 
						
							
							
								
								## 秒结、日结恢复分红奖衔;
							
							
							
							
							
						 | 
						
							2025-06-19 15:30:23 +08:00 |