Commit Graph

267 Commits

Author SHA1 Message Date
cabbage bac4911559 ## 调整发货方法; 2025-06-23 15:42:31 +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 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
cabbage 86b935a85a Merge remote-tracking branch 'origin/dev' into test 2025-06-18 10:45:18 +08:00
cabbage de74a7b87d ## 调整会员、订单前缀; 2025-06-18 10:45:03 +08:00
cabbage 70dc1fcf46 ## 处理业绩表方法; 2025-06-18 10:45:03 +08:00
cabbage 550225fb15 ## 调整会员、订单前缀; 2025-06-18 10:33:42 +08:00
cabbage 2d51c2b60b ## 处理业绩表方法; 2025-06-17 17:34:38 +08:00
cabbage 7bf86ffad5 ## 处理业绩表方法; 2025-06-17 17:33:53 +08:00
cabbage 97309e5942 ## 推荐正反查调整处理方式; 2025-06-17 17:29:13 +08:00
cabbage 7bd14618d9 ## 真实奖衔分析、等级升级查询; 2025-06-17 17:29:13 +08:00
cabbage 2d8ca9919f ## 去掉旧抗衰达人,调整推荐相关列表; 2025-06-17 17:29:12 +08:00
cabbage b371c4e4b3 ## 等级修改、0元注册、删除空点相关接口调整; 2025-06-17 17:29:12 +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 bdc917dce4 ## Fix - 盒数计算大小区后排除注水 2025-06-17 14:18:37 +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 3b104b5554 ## 判断升级时,添加本身注水盒数处理; 2025-06-17 13:22:11 +08:00
cabbage 13ee5b8ee1 ## 判断升级时,添加本身注水盒数处理; 2025-06-17 13:21:31 +08:00
cabbage ea0a7d82bc ## 调整等级判断处理,注水单独处理; 2025-06-17 11:26:27 +08:00
sangelxiu1 9d8d22ce1a ## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水 2025-06-17 11:26:27 +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 394b6dad10 ## 日结添加团队月盒数字段及处理;月奖查询订单不走dubbo服务,改为自查询; 2025-06-17 10:47:16 +08:00
sangelxiu1 fc1fdcde70 ## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM) 2025-06-17 10:47:16 +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 0ef47851d5 ## 生产nacos配置; 2025-06-16 16:29:09 +08:00
cabbage a46ec5257e ## 生产nacos配置; 2025-06-16 16:07:48 +08:00
cabbage 969c8bfe83 ## xxl生产配置; 2025-06-16 15:14:18 +08:00
cabbage b2d754d2f2 ## xxl生产配置; 2025-06-16 15:14:05 +08:00