Commit Graph

166 Commits

Author SHA1 Message Date
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
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
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 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 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
sangelxiu1 b84e3439ee Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 11:08:13 +08:00
sangelxiu1 b425609f79 ## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水 2025-06-17 11:08:06 +08:00
cabbage 34b1b8632a ## 日结添加团队月盒数字段及处理;月奖查询订单不走dubbo服务,改为自查询; 2025-06-17 10:46:35 +08:00
sangelxiu1 2bd224b3d4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 09:39:32 +08:00
sangelxiu1 2615f517de ## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM) 2025-06-17 09:39:25 +08:00
cabbage f4899490de ## 更新奖衔语句问题处理; 2025-06-16 15:00:28 +08:00
cabbage 174fe27340 ## 更新奖衔语句问题处理; 2025-06-16 14:51:42 +08:00
cabbage ad8c536b68 Merge remote-tracking branch 'origin/dev' into dev 2025-06-16 10:09:49 +08:00
cabbage b386dda7ba ## 等级处理改为逻辑删除; 2025-06-16 10:09:45 +08:00