Commit Graph

588 Commits

Author SHA1 Message Date
sangelxiu1 34a49ff9c5 ## Feat - 在线支付明细增加订单类型 2025-07-22 09:44:12 +08:00
cabbage c0e32d689a ## 直推收益改为商品价格10%; 2025-07-22 09:44:09 +08:00
cabbage d180bfed66 ## 雨汐体系V4、V5升级盒数单独处理;
V4:总500,小100;
V5:总2000,小400;
2025-07-22 09:44:09 +08:00
sangelxiu1 0867a54488 ## Feat - 体系分享图&支付回调增加支付通道流水号 2025-07-22 09:44:05 +08:00
sangelxiu1 db7baf404e ## Fix - sql脚本 2025-07-22 09:44:05 +08:00
sangelxiu1 490e7691ad ## Fix - sql脚本 2025-07-22 09:44:04 +08:00
sangelxiu1 cb7c05fc03 ## Feat - 后台列表增加分账金额 2025-07-22 09:44:04 +08:00
cabbage 5b473faf98 ## 撤单重消订单推送秒结处理; 2025-07-19 07:56:33 +08:00
cabbage 4572f597a9 ## 在线支付处理多送两级问题; 2025-07-19 07:55:24 +08:00
cabbage 92a7c650e7 ## 在线支付处理升级多送两级问题; 2025-07-19 07:55:24 +08:00
cabbage ea3e4d923c Merge remote-tracking branch 'origin/test' into online 2025-07-11 09:33:32 +08:00
cabbage 9cafc562fa ## 秒结执行延迟1秒; 2025-07-11 09:30:18 +08:00
cabbage b450ebf3a1 ## 商品列表添加权限控制; 2025-07-10 15:23:06 +08:00
cabbage ed0f391eb4 ## 复购级差默认显示4位小数; 2025-07-10 15:23:05 +08:00
cabbage 00de760326 ## 京东收银台配置提取nacos; 2025-07-10 14:39:26 +08:00
cabbage 28c42b4851 ## 商品列表添加权限控制; 2025-07-10 14:29:51 +08:00
cabbage b8e4402b78 ## 新复购级差收益累计商品数量; 2025-07-10 14:29:51 +08:00
cabbage ed49bcf975 ## 新复购级差收益累计商品数量; 2025-07-10 14:29:51 +08:00
cabbage 19bee0f3b2 ## 新复购级差判断类型调整; 2025-07-10 12:02:56 +08:00
cabbage 8b4e309f8a ## 新复购级差枚举值转换处理; 2025-07-10 10:52:45 +08:00
cabbage ea99ec0bb5 ## 商品盒数中间表支持小数盒数; 2025-07-10 10:52:44 +08:00
cabbage 158f26ec9d ## 商品盒数中间表支持小数盒数; 2025-07-10 10:52:44 +08:00
cabbage 18e072c3f2 ## 添加体系奖项配置; 2025-07-10 10:52:41 +08:00
sangelxiu1 69d6b9eaa4 ## Fix - 回调地址 2025-07-10 09:58:33 +08:00
sangelxiu1 eb230f471c ## Fix - 回调地址 2025-07-10 09:55:34 +08:00
sangelxiu1 7c30dd0041 ## Fix - 支付回调地址&提现驳回返回金额 2025-07-10 09:46:21 +08:00
cabbage d7b0faff60 ## 没有配置会员复购级差权限校验修改; 2025-07-09 15:34:28 +08:00
cabbage 6e43b5c970 Merge remote-tracking branch 'origin/dev' into test 2025-07-09 14:49:23 +08:00
cabbage 192be3ff98 ## 复购级差会员显示字段权限调整; 2025-07-09 14:47:30 +08:00
sangelxiu1 2f6ce5d97e Merge remote-tracking branch 'origin/dev' into dev 2025-07-09 13:49:42 +08:00
sangelxiu1 04d0c20c77 ## Feat - 退款驳回 2025-07-09 13:49:36 +08:00
cabbage b601cc4181 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
2025-07-09 11:50:46 +08:00
cabbage a5f41adab9 ## 去除站点配置相关; 2025-07-09 11:49:34 +08:00
cabbage 0dbc58f58b ## 特殊体系复购级差奖项; 2025-07-09 11:18:07 +08:00
cabbage e8d9cab955 ## 去掉进销存相关内容; 2025-07-09 11:16:15 +08:00
sangelxiu1 6116ad468c ## Feat - 新零售-支付 2025-07-09 11:02:15 +08:00
sangelxiu1 613c8a8002 ## Feat - 新零售-支付 2025-07-09 10:59:32 +08:00
sangelxiu1 2044185ae3 ## Feat - 支付依赖 2025-07-09 10:58:36 +08:00
cabbage 2417962cd0 Merge remote-tracking branch 'origin/test' into online
# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuRegionAssessServiceImpl.java
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
#	bd-business/bd-business-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
#	bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailAchieveVO.java
#	bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml
#	bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
#	bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java
2025-07-09 09:20:11 +08:00
sangelxiu1 8bea3e39b6 ## Opt - 区域体系增加查询条件 2025-07-09 09:18:03 +08:00
cabbage 4ff23dadbd ## 奖衔配置调整;去掉4-N配置等; 2025-07-09 09:18:00 +08:00
sangelxiu1 82f0ab78a0 ## Feat - 盒数调整为小数 2025-07-09 09:17:54 +08:00
sangelxiu1 d19e7b15aa ## Feat - 选择区域增加小区10W验证&按体系分组绑定区域 2025-07-09 09:17:50 +08:00
sangelxiu1 ae3b75ae33 ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-07-09 09:17:46 +08:00
sangelxiu1 a0f69be043 ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-07-09 09:17:40 +08:00
sangelxiu1 88c0c939fd ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-07-09 09:16:17 +08:00
woody 9ccd411aa6 feat(BdRegionVertexServiceImpl): 添加区域分组判断逻辑修复 2025-07-09 09:16:12 +08:00
sangelxiu1 eaa6c9d117 ## Opt - 补充继承基类的sql 2025-07-09 09:16:10 +08:00
sangelxiu1 4b9db13ef4 ## Feat - 添加&修改体系,增加分组ID 2025-07-09 09:15:29 +08:00
sangelxiu1 93498d45af ## Feat - 增加获取全部区域体系分组配置列表&体系列表增加绑定区域名称 2025-07-09 09:15:25 +08:00