Commit Graph

690 Commits

Author SHA1 Message Date
cabbage 93960988a7 ## 奖金结算添加明细表补偿处理; 2025-10-29 16:51:27 +08:00
cabbage fb9a90a81e ## 去掉级差价格计算; 2025-10-29 10:50:56 +08:00
cabbage c3c20d3e9f ## 调整等级、奖衔初始处理; 2025-10-29 10:37:22 +08:00
cabbage f4457f246f ## 去掉盒数等处理; 2025-10-29 10:08:06 +08:00
sangelxiu1 f9d935d52d ## Opt - 分享注册会员-奖衔 2025-10-29 10:05:50 +08:00
sangelxiu1 cdfece99bb Merge remote-tracking branch 'origin/dev' into dev 2025-10-29 10:03:39 +08:00
sangelxiu1 183528f287 ## Opt - 分享注册会员-奖衔 2025-10-29 10:03:33 +08:00
cabbage 5503cdc595 ## 分享注册计算邮费补全用户信息调整; 2025-10-29 10:03:33 +08:00
cabbage a8cc0c982c ## 注册成功短信改为member服务调用发送; 2025-10-29 09:43:53 +08:00
sangelxiu1 1178839077 ## Fix - 京东支付回调,支付工具(payTool)可能为空 2025-10-29 09:32:37 +08:00
cabbage 47dfd8ba9e Merge remote-tracking branch 'origin/dev' into dev 2025-10-29 09:07:13 +08:00
cabbage 4cc3685af0 ## 赠品积分如果为空,结算处理判断调整; 2025-10-29 09:07:05 +08:00
sangelxiu1 09b3ce07f5 Merge remote-tracking branch 'origin/dev' into dev 2025-10-28 18:13:00 +08:00
sangelxiu1 de3af2b86b ## Opt - 分享注册会员-奖衔 2025-10-28 18:12:54 +08:00
sangelxiu1 630c2933d7 ## test push 2025-10-28 17:31:20 +08:00
cabbage 0b0a592c14 Merge remote-tracking branch 'origin/dev' into dev 2025-10-28 17:16:33 +08:00
cabbage fe9345c502 ## 发送短信单独处理; 2025-10-28 17:16:29 +08:00
zhangheng 649f977f23 ## 后台看板数据会员数据总数根据支付时间查询 2025-10-28 16:18:50 +08:00
cabbage a999161877 ## 订单支付时间正向、逆向处理; 2025-10-28 16:16:57 +08:00
cabbage dca8e9dc7c ## 订单支付时间正向、逆向处理; 2025-10-28 15:52:59 +08:00
cabbage 9b9e81e75e ## 钱包明细国际化转换处理; 2025-10-28 15:44:22 +08:00
cabbage ce88d51364 ## 订单支付更新会员支付时间和状态; 2025-10-28 15:30:24 +08:00
cabbage a6508795b8 Merge remote-tracking branch 'origin/dev' into dev 2025-10-28 15:22:57 +08:00
cabbage 00569e0866 ## 订单支付更新会员支付时间和状态; 2025-10-28 15:22:53 +08:00
zhangheng 282a9d20f0 ## 后台看板数据会员数据根据支付时间查询 2025-10-28 15:02:57 +08:00
cabbage b39d8a18d8 ## 奖金来源可查询赠品积分; 2025-10-28 14:51:23 +08:00
cabbage 462a7ac369 Merge remote-tracking branch 'origin/dev' into dev 2025-10-28 14:51:04 +08:00
cabbage 6e2518bc13 ## 赠品积分奖金类型调整; 2025-10-28 14:51:00 +08:00
zhangheng 77fcec363a ## 后台看板数据会员数据根据创建时间查询,取消支付状态条件 2025-10-28 14:45:55 +08:00
zhangheng 60ff3a872d ## 后台看板数据会员数据逻辑修改 2025-10-28 14:24:30 +08:00
cabbage 6f9614f40c ## 币种配置去除国际化; 2025-10-28 14:03:59 +08:00
cabbage d5708d7422 ## 专区包邮不走国际化; 2025-10-28 13:57:54 +08:00
cabbage 6e48e35fd2 ## 撤单处理会员等级; 2025-10-28 11:41:47 +08:00
zhangheng f8373e6989 ## 后台看板数据添加赠品积分 2025-10-28 10:50:04 +08:00
cabbage 86dd9b7d0c ## 448下单时报空指针处理; 2025-10-28 10:29:55 +08:00
cabbage e8a6650d98 ## 453积分收益发放字段调整; 2025-10-28 10:17:35 +08:00
cabbage 2eb7015c8a ## 451平级收益处理需要判断自己和上一级的奖衔; 2025-10-28 10:15:59 +08:00
cabbage b1d3c39391 ## BUG449处理; 2025-10-28 10:07:57 +08:00
cabbage 878cf0f6b2 Merge remote-tracking branch 'origin/dev' into dev 2025-10-28 09:50:05 +08:00
cabbage 4f4e7e6062 ## 当天新会员,首次升2、3阶段,初始化处理; 2025-10-28 09:49:58 +08:00
sangelxiu1 58d19e59fd ## Fix - bugID=(448, 449) 2025-10-28 09:34:05 +08:00
sangelxiu1 c14cd38c67 Merge remote-tracking branch 'origin/dev' into dev 2025-10-27 17:55:08 +08:00
sangelxiu1 5cff3106d7 ## Opt - 限额(金额->业绩) 2025-10-27 17:54:53 +08:00
cabbage e1360005aa ## 计算等级,如果是最高级直接返回; 2025-10-27 17:54:42 +08:00
sangelxiu1 ae7bb67d42 ## Fix - 使用下单前的原始等级 2025-10-27 17:45:52 +08:00
cabbage e5ca77d7b6 ## 计算等级处理; 2025-10-27 17:33:29 +08:00
sangelxiu1 4e093d2a2d ## Fix - 非空会员不进行奖衔初始化 2025-10-27 17:24:08 +08:00
cabbage 5889986f0f ## 赠送积分发放处理; 2025-10-27 16:55:25 +08:00
cabbage 87d968aeb3 ## 新逻辑等级处理; 2025-10-27 16:50:34 +08:00
cabbage b2d29d0498 ## 业绩汇总添加赠品专区返回; 2025-10-27 16:37:19 +08:00