Commit Graph

308 Commits

Author SHA1 Message Date
cabbage caf6cbe158 ## 奖金来源、奖金汇总、奖金明细添加培训津贴返回以及导出; 2025-06-27 11:45:08 +08:00
sangelxiu1 b64f1100b9 ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-06-27 11:45:05 +08:00
cabbage ca7a6821b3 ## 日结处理荣誉奖衔; 2025-06-27 11:44:59 +08:00
cabbage 3bbdd77cce ## 培育津贴; 2025-06-27 09:47:56 +08:00
cabbage 4828ded5bb ## 去掉奖金没用的实体; 2025-06-27 09:47:54 +08:00
cabbage 430e89184c ## 去掉不用的4-N等老奖金处理;去掉荣誉墙、推荐达人等; 2025-06-27 09:47:52 +08:00
cabbage e95eb1e448 ## 手动开通V1V2单独判断升级; 2025-06-25 17:59:18 +08:00
cabbage bfe200735d ## 复购级差收益处理修改; 2025-06-25 16:57:55 +08:00
cabbage 9c6275b2f1 ## 赠送等级之后可以继续购买升级; 2025-06-25 16:42:32 +08:00
cabbage 14cb2bc9e6 ## 去掉结算中关于奖衔相关处理; 2025-06-25 16:22:51 +08:00
cabbage 17d57f4ff8 ## 赠送等级之后可以继续购买升级; 2025-06-25 16:22:51 +08:00
cabbage 313cc89cb3 ## 会员奖金明细福利分红返回字段调整; 2025-06-25 15:15:33 +08:00
cabbage c488324f54 ## 去掉奖金查询不需要的方法; 2025-06-25 15:15:33 +08:00
cabbage fdacb2243a ## 去掉部分不需要的实体及注释; 2025-06-25 15:15:32 +08:00
cabbage 7e8e515adf ## 奖金来源、奖金明细显示以及导出调整; 2025-06-25 15:15:32 +08:00
cabbage 3a7a415c21 ## 复购级差收益累计以及备注调整; 2025-06-25 11:37:17 +08:00
cabbage 20992c85f4 ## 会员H5奖金明细月奖字段返回调整; 2025-06-25 11:37:16 +08:00
cabbage 3e9cbc4094 ## 默认月结期间表取值调整; 2025-06-25 10:49:30 +08:00
cabbage 8dafeb452e ## 2025.06.25需求,因V1-V3注册、升级多送两级,非手动V3V4可以再购买升V5; 2025-06-25 10:24:00 +08:00
sangelxiu1 5ff44cfc14 ## Fix - 初始化 2025-06-24 10:03:53 +08:00
sangelxiu1 e49accdfd8 ## Fix - npe 2025-06-24 09:37:42 +08:00
cabbage f76b08edf5 ## 前台会员明细返回; 2025-06-23 17:59:15 +08:00
cabbage affbb04222 ## 奖金明细、奖金来源新奖金字段; 2025-06-23 17:59:15 +08:00
cabbage c0d2e49b87 ## 月度分红处理; 2025-06-23 17:59:14 +08:00
cabbage 6f09640371 ## 调整发货方法; 2025-06-23 15:42:09 +08:00
cabbage bd62730edb ## 添加测试结算日志; 2025-06-23 14:24:53 +08:00
cabbage 391716318c ## 测试环境月结奖衔取当前期间; 2025-06-23 14:24:52 +08:00
cabbage 6cbf250be2 ## 发货导出模板字段调整; 2025-06-23 13:28:10 +08:00
cabbage a5c2147cbe ## 月奖月度级差、复购级差; 2025-06-23 11:58:42 +08:00
cabbage d402eed6ad ## 计算分红奖衔时,自己消费的虚拟区也算一个区; 2025-06-21 09:06:56 +08:00
sangelxiu1 b3a613e956 ## Opt - 增加修改结算等级->最高等级下进行奖衔初始化 2025-06-21 09:06:55 +08:00
cabbage f1264dd994 ## 分红奖衔秒结处理; 2025-06-20 17:07:44 +08:00
cabbage 63cc9acb4a ## 分红奖衔撤单回退处理; 2025-06-19 17:41:24 +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