Commit Graph

596 Commits

Author SHA1 Message Date
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
sangelxiu1 f7f995c9c3 ## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝 2025-06-19 13:38:58 +08:00
cabbage 164a336558 ## 替换国际化处理; 2025-06-18 16:46:04 +08:00
cabbage dfc21bc3bd ## 等级枚举不走国际化; 2025-06-18 16:35:12 +08:00
cabbage bdc00adc9e ## 指定新零售在线支付测试账号; 2025-06-18 15:27:06 +08:00
cabbage e623987b61 Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 11:22:26 +08:00
cabbage af9a71f31a ## 调整部门获取下个编号方法; 2025-06-18 11:22:21 +08:00
sangelxiu1 8804791eca Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 11:06:44 +08:00
sangelxiu1 f4e2d9a16d ## Fix - 自动登录,获取systemType异常 2025-06-18 11:06:38 +08:00
cabbage 2feb0076e1 ## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法; 2025-06-18 10:55:44 +08:00
cabbage 550225fb15 ## 调整会员、订单前缀; 2025-06-18 10:33:42 +08:00
cabbage 7bf86ffad5 ## 处理业绩表方法; 2025-06-17 17:33:53 +08:00
cabbage 3c679ce8a8 ## 推荐正反查调整处理方式; 2025-06-17 17:28:17 +08:00
cabbage f79e4a7ab6 ## 真实奖衔分析、等级升级查询; 2025-06-17 16:57:14 +08:00
cabbage 45e3ec095c ## 去掉旧抗衰达人,调整推荐相关列表; 2025-06-17 16:03:53 +08:00
cabbage e89e09371f ## 等级修改、0元注册、删除空点相关接口调整; 2025-06-17 15:43:29 +08:00
sangelxiu1 52f8a8585f Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 13:58:24 +08:00
sangelxiu1 03780c8925 ## Fix - 盒数计算大小区后排除注水 2025-06-17 13:58:19 +08:00
cabbage 13ee5b8ee1 ## 判断升级时,添加本身注水盒数处理; 2025-06-17 13:21:31 +08:00
cabbage 555bfecd30 ## 调整等级判断处理,注水单独处理; 2025-06-17 11:26:08 +08:00