Commit Graph

605 Commits

Author SHA1 Message Date
cabbage 3f6ae948da ## 添加测试结算日志; 2025-06-23 14:24:32 +08:00
cabbage 0854376e90 ## 测试环境月结奖衔取当前期间; 2025-06-23 14:23:04 +08:00
cabbage c344642bda ## 计算分红奖衔时,自己消费的虚拟区也算一个区; 2025-06-23 13:42:57 +08:00
sangelxiu1 d8bd6c4b87 ## Opt - 增加修改结算等级->最高等级下进行奖衔初始化 2025-06-23 13:42:57 +08:00
cabbage 5ae31a275b ## 分红奖衔秒结处理; 2025-06-23 13:42:53 +08:00
cabbage 43affef844 ## 分红奖衔撤单回退处理; 2025-06-23 13:42:52 +08:00
sangelxiu1 3ae344c135 ## Opt - PageUtils.clearPage AOP 2025-06-23 13:42:50 +08:00
cabbage d3e3008e2c ## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理; 2025-06-23 13:42:47 +08:00
cabbage afaef09343 ## get-info返回分红奖衔; 2025-06-23 13:42:46 +08:00
cabbage 428e8872d5 ## 秒结、日结恢复分红奖衔; 2025-06-23 13:42:40 +08:00
sangelxiu1 ea23bcded1 ## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝 2025-06-23 13:42:40 +08:00
cabbage 54298ea3d4 ## 替换国际化处理; 2025-06-23 13:37:26 +08:00
cabbage b808f5c70f ## 等级枚举不走国际化; 2025-06-23 13:36:11 +08:00
cabbage 934de57f27 ## 指定新零售在线支付测试账号; 2025-06-23 13:36:06 +08:00
cabbage a320fe9045 ## 发货导出模板字段调整; 2025-06-23 13:35:04 +08:00
cabbage 6cbf250be2 ## 发货导出模板字段调整; 2025-06-23 13:28:10 +08:00
cabbage 4a376e936b ## 发货导出模板字段调整; 2025-06-23 13:27:24 +08:00
cabbage a5c2147cbe ## 月奖月度级差、复购级差; 2025-06-23 11:58:42 +08:00
cabbage 2731274f58 ## 月奖月度级差、复购级差; 2025-06-23 11:58:10 +08:00
cabbage d402eed6ad ## 计算分红奖衔时,自己消费的虚拟区也算一个区; 2025-06-21 09:06:56 +08:00
sangelxiu1 b3a613e956 ## Opt - 增加修改结算等级->最高等级下进行奖衔初始化 2025-06-21 09:06:55 +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 f1264dd994 ## 分红奖衔秒结处理; 2025-06-20 17:07:44 +08:00
cabbage 55f5e0523d ## 分红奖衔秒结处理; 2025-06-20 17:06:06 +08:00
cabbage 63cc9acb4a ## 分红奖衔撤单回退处理; 2025-06-19 17:41:24 +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 7af217edcd Merge remote-tracking branch 'refs/remotes/origin/dev' into test 2025-06-19 17:35:53 +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 3b408c163b ## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理; 2025-06-19 16:09:23 +08:00
cabbage 7b5e4e264e ## get-info返回分红奖衔; 2025-06-19 16:09:23 +08:00
cabbage bacedcfd33 ## 秒结、日结恢复分红奖衔; 2025-06-19 16:09:22 +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 6647920be4 Merge remote-tracking branch 'refs/remotes/origin/dev' into test 2025-06-19 13:39:56 +08:00
sangelxiu1 f7f995c9c3 ## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝 2025-06-19 13:38:58 +08:00
sangelxiu1 953b682f52 Merge remote-tracking branch 'refs/remotes/origin/dev' into test 2025-06-18 16:59:56 +08:00
cabbage 164a336558 ## 替换国际化处理; 2025-06-18 16:46:04 +08:00
cabbage 4da0791b78 ## 等级枚举不走国际化; 2025-06-18 16:36:53 +08:00
cabbage dfc21bc3bd ## 等级枚举不走国际化; 2025-06-18 16:35:12 +08:00
cabbage 1f0f2aedc5 ## 指定新零售在线支付测试账号; 2025-06-18 15:56:48 +08:00
cabbage bdc00adc9e ## 指定新零售在线支付测试账号; 2025-06-18 15:27:06 +08:00
cabbage 6a0e9c7463 ## 调整部门获取下个编号方法; 2025-06-18 11:23:39 +08:00
sangelxiu1 236296dbc4 ## Fix - 自动登录,获取systemType异常 2025-06-18 11:23:38 +08:00
cabbage c2c50a8408 ## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法; 2025-06-18 11:23:38 +08:00