Commit Graph

589 Commits

Author SHA1 Message Date
sangelxiu1 c9578916a3 ## Opt - 商品自定义排序 2025-07-21 09:32:36 +08:00
cabbage e4b7fef2e5 ## 在线支付处理多送两级问题; 2025-07-18 21:26:51 +08:00
cabbage 3afae49d92 ## 在线支付处理升级多送两级问题; 2025-07-18 20:54:57 +08:00
sangelxiu1 e7a339a69a ## Fix - 分账 2025-07-18 11:28:13 +08:00
sangelxiu1 15338324bc ## Opt - 盒数&市场动态, 凌晨3天前取-1天 2025-07-18 10:18:35 +08:00
sangelxiu1 5e6b4933bd ## Feat - 在线支付明细增加订单类型 2025-07-15 15:11:35 +08:00
sangelxiu1 3961ea195d Merge remote-tracking branch 'origin/test' into test 2025-07-15 15:06:32 +08:00
sangelxiu1 de0c01164e ## Feat - 在线支付明细增加订单类型 2025-07-15 15:06:22 +08:00
cabbage 3a772ee9d8 ## 撤单重消订单推送秒结处理; 2025-07-15 13:31:44 +08:00
cabbage 4bd21b9950 ## 直推收益改为商品价格10%; 2025-07-15 09:10:52 +08:00
cabbage 840f2b754f ## 雨汐体系V4、V5升级盒数单独处理;
V4:总500,小100;
V5:总2000,小400;
2025-07-15 09:10:52 +08:00
sangelxiu1 a1e5f53b45 Merge remote-tracking branch 'origin/test' into test 2025-07-14 14:15:33 +08:00
sangelxiu1 f476b3a09a ## Feat - 体系分享图&支付回调增加支付通道流水号 2025-07-14 14:15:23 +08:00
sangelxiu1 aa211e5924 ## Fix - sql脚本 2025-07-11 11:27:37 +08:00
sangelxiu1 520d791db2 ## Fix - sql脚本 2025-07-11 11:27:37 +08:00
sangelxiu1 22a8489629 Merge remote-tracking branch 'origin/test' into test 2025-07-11 10:14:28 +08:00
sangelxiu1 c36f3d740c ## Feat - 后台列表增加分账金额 2025-07-11 10:14:16 +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 1b4e8b9d1b ## 会员升级奖衔处理优化; 2025-07-07 15:46:36 +08:00
cabbage 262066c6df ## 添加日志;调整订单类型判断位置; 2025-07-07 15:46:36 +08:00
cabbage d9e9589d70 ## 会员升级奖衔处理优化; 2025-07-07 15:44:54 +08:00
cabbage dec97f793e Merge remote-tracking branch 'origin/dev' into dev 2025-07-07 10:43:11 +08:00
cabbage 75380f03d7 ## 添加日志;调整订单类型判断位置; 2025-07-07 10:43:06 +08:00
sangelxiu1 fcee5cb16e ## Opt - 空值验证 2025-07-05 10:18:28 +08:00