3
0
Fork 0
Commit Graph

531 Commits

Author SHA1 Message Date
sangelxiu1 1e0d0989c7 ## Fix - 分账金额 2025-07-18 11:27:03 +08:00
sangelxiu1 121dbc52ba ## Fix - 分账金额 2025-07-18 11:26:51 +08:00
sangelxiu1 7792dc47f0 ## Feat - 京东支付依赖 2025-07-16 09:25:55 +08:00
sangelxiu1 cca882d4c8 ## Feat - 京东支付依赖打包插件 2025-07-16 09:23:05 +08:00
sangelxiu1 7105312311 ## Feat - 京东支付 2025-07-16 09:16:51 +08:00
sangelxiu1 3fa3725101 ## Feat - 京东支付 2025-07-16 09:11:21 +08:00
sangelxiu1 90bab6aebd Merge remote-tracking branch 'origin/dev' into dev 2025-07-15 14:13:29 +08:00
sangelxiu1 b9d073f8be ## Feat - 京东支付依赖打包插件 2025-07-15 14:13:22 +08:00
cabbage e308911271 ## xxl-job配置修改; 2025-07-15 11:07:01 +08:00
cabbage 34af97c895 ## nacos配置修改; 2025-07-15 11:07:00 +08:00
cabbage 31492704c5 ## xxl-job配置修改; 2025-07-15 11:02:45 +08:00
cabbage b9f2c0884a ## nacos配置修改; 2025-07-15 10:52:46 +08:00
cabbage 90ed09631f ## 奖金发放处理; 2025-07-14 16:07:16 +08:00
cabbage 721b297cbd ## 撤单处理取消区域配置; 2025-07-14 16:06:56 +08:00
cabbage 712fda3fdf ## 奖金发放处理; 2025-07-14 16:05:30 +08:00
sangelxiu1 7c267b2444 ## Feat - 京东支付依赖 2025-07-14 11:52:58 +08:00
sangelxiu1 f4f8cbb13f Merge remote-tracking branch 'origin/test' into test 2025-07-14 11:09:12 +08:00
sangelxiu1 9b1b143422 ## Opt - 无需验证当前用户ID 2025-07-14 11:09:02 +08:00
sangelxiu1 59216b24d5 Merge remote-tracking branch 'origin/dev' into dev 2025-07-14 11:08:36 +08:00
sangelxiu1 c902b720c2 ## Opt - 无需验证当前用户ID 2025-07-14 11:08:29 +08:00
cabbage b9472479cc ## 撤单处理取消区域配置; 2025-07-14 10:14:55 +08:00
cabbage 0afa2dc051 ## 自助撤单处理推荐人等级; 2025-07-14 09:42:06 +08:00
cabbage 443dbbe4b8 ## 自助撤单处理推荐人等级; 2025-07-14 09:40:48 +08:00
sangelxiu1 5e21e19441 ## Opt - 平铺区域数据 2025-07-14 09:24:17 +08:00
sangelxiu1 1df74dedba Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java
2025-07-14 09:13:40 +08:00
sangelxiu1 1ee7f13ca1 ## Opt - 平铺区域数据 2025-07-14 09:12:44 +08:00
cabbage 30b6468912 ## 自助撤单处理推荐人等级;去掉条码校验; 2025-07-12 16:36:47 +08:00
cabbage 26de66544b ## 注册订单撤单处理推荐人等级; 2025-07-12 16:36:46 +08:00
cabbage 4e813f17b9 ## 自助撤单处理推荐人等级;去掉条码校验; 2025-07-12 16:24:23 +08:00
cabbage 9b225459a0 ## 注册订单撤单处理推荐人等级; 2025-07-12 16:02:59 +08:00
cabbage a97f519179 ## 复购级差奖金显示调整(269); 2025-07-12 15:22:47 +08:00
cabbage fcda6b1b77 ## 撤单处理推荐人等级; 2025-07-12 15:22:37 +08:00
cabbage 848d6a0756 ## 首购级差处理逻辑优化; 2025-07-12 15:22:34 +08:00
cabbage fc5826caf1 ## 去掉复购专区限购和部分撤单处理; 2025-07-12 15:22:27 +08:00
cabbage 1814abf5f9 ## 复购级差奖金显示调整(269); 2025-07-12 15:21:32 +08:00
cabbage 8b9f461c20 ## 撤单处理推荐人等级; 2025-07-12 15:16:30 +08:00
cabbage f4ef2a9326 ## 首购级差处理逻辑优化; 2025-07-12 14:17:38 +08:00
cabbage 5de0a3ee32 ## 复购级差计算先乘再减; 2025-07-12 11:56:43 +08:00
cabbage d0781ce37a ## 复购级差计算先乘再减; 2025-07-12 11:54:50 +08:00
cabbage 3ebcfca6f7 ## 去掉复购专区限购和部分撤单处理; 2025-07-12 10:41:37 +08:00
cabbage 6b9a114e60 ## 会员端奖金显示字段调整; 2025-07-12 09:50:49 +08:00
cabbage 3c36134d87 ## 空单注册返回等级处理(257); 2025-07-12 09:50:48 +08:00
cabbage 45a707adf0 ## 去掉结算奖衔相关入库操作;去掉部分不需要奖金基础数据查询; 2025-07-12 09:50:48 +08:00
cabbage e1943603de ## 会员端奖金显示字段调整; 2025-07-12 09:49:22 +08:00
cabbage 8ba98c5118 ## 空单注册返回等级处理(257); 2025-07-12 09:38:03 +08:00
cabbage 7819281f53 ## 去掉结算奖衔相关入库操作;去掉部分不需要奖金基础数据查询; 2025-07-12 09:33:44 +08:00
cabbage 987a78b89d ## 修改限购提示(366); 2025-07-11 18:09:56 +08:00
cabbage 2d83335200 ## 后台奖金显示处理; 2025-07-11 18:09:56 +08:00
cabbage 526ffe6c49 ## 注册、升级订单添加区域选择处理; 2025-07-11 18:09:55 +08:00
cabbage d3ea099ef3 ## 去掉部分不用的业绩、区域考核等;调整部分接口参数; 2025-07-11 18:09:55 +08:00