Commit Graph

1342 Commits

Author SHA1 Message Date
zhangheng c4bfaaf494 ## bug371 业绩汇总页,选了隶属体系搜索后点导出,导出的excel是所有的,应该只导出当前搜索的体系的 2025-09-09 15:21:15 +08:00
cabbage bae31672fb ## 见点奖考核添加复购考核时间判断处理; 2025-09-09 09:54:06 +08:00
cabbage f3cc4cdea0 ## 1980升级的9900可以再购买9900但是等级不变(363); 2025-09-08 10:23:01 +08:00
cabbage 3e3de4372b ## 提现走绑定银行卡逻辑;银行卡添加4要素认证; 2025-09-08 10:23:00 +08:00
cabbage d2b1d3658e ## 1980升级的9900可以再购买9900但是等级不变(363); 2025-09-08 10:23:00 +08:00
sangelxiu1 0202a93360 ## Opt - 调用京东支付减少过程日志输出. 2025-09-05 19:04:06 +08:00
sangelxiu1 d6303efc7b ## Opt - 手动补偿异常回调-验证状态 2025-09-05 19:04:06 +08:00
sangelxiu1 42b52b037a ## Opt - 验证京东响应体内-支付工具属性 2025-09-05 19:04:05 +08:00
cabbage 1f012e2c5d ## 创建考核月表语句调整; 2025-09-02 10:34:32 +08:00
cabbage f14a8a0da3 ## 兼容调换货产品之后的发货清单; 2025-09-02 10:34:30 +08:00
cabbage a64f6b8d59 ## 总裁看板复购添加秒杀订单统计; 2025-09-02 10:34:28 +08:00
cabbage 5d47ccf7a5 ## 统计报表复购专区添加秒杀专区; 2025-09-01 15:03:47 +08:00
sangelxiu1 d6a5571792 ## Opt - 验证重复下单 2025-09-01 09:37:27 +08:00
cabbage 36bb8b744b ## 188实际支付不能使用政策币; 2025-08-28 09:34:16 +08:00
cabbage 238e307415 ## 专区商品列表添加等级、奖衔权限判断; 2025-08-28 09:34:15 +08:00
cabbage cda7f34f8d ## 订单详情导出添加商品类型; 2025-08-27 09:46:06 +08:00
cabbage 08fb017229 ## 订单查询不强制判断体系必须存在; 2025-08-27 09:46:05 +08:00
woody e7f81234bc fix(BdWaresExtend): 商品管理-上下架及预计发货时间可以传空 2025-08-27 09:46:05 +08:00
sangelxiu1 5af2ad91d6 ## Opt - 手动补偿异常回调 2025-08-21 09:31:41 +08:00
cabbage ec4c634840 ## 提现添加身份证号;调整导出与列表对齐; 2025-08-21 09:31:40 +08:00
cabbage d1f8a3735d ## 仓储导出排序调整; 2025-08-21 09:31:40 +08:00
cabbage b79d1177aa Merge remote-tracking branch 'origin/bd_test' into bd_online
# Conflicts:
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
#	bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/api/ApiMemberController.java
#	bd-business/bd-business-sale/src/main/java/com/hzs/sale/wares/controller/api/ApiBdWaresController.java
#	bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
2025-08-18 11:45:44 +08:00
cabbage 307cf73c58 ## 直播出现问题修复; 2025-08-18 10:13:21 +08:00
cabbage 0f22ab51c6 Merge remote-tracking branch 'origin/bd_dev' into bd_test
# Conflicts:
#	bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
2025-08-18 09:38:00 +08:00
cabbage d6d92d23cc ## 直播出现问题修复; 2025-08-18 09:36:59 +08:00
cabbage bf510f2566 ## 直播出现问题修复; 2025-08-18 09:36:09 +08:00
cabbage 38dea423b0 Merge remote-tracking branch 'origin/bd_dev' into bd_dev
# Conflicts:
#	bd-business/bd-business-system/src/main/java/com/hzs/system/config/service/impl/BdAdvertBannerServiceImpl.java
2025-08-18 09:34:47 +08:00
cabbage 75457274cf ## 直播出现问题修复; 2025-08-18 09:34:37 +08:00
sangelxiu1 49d88da3c8 ## Fix - 兼容空体系 2025-08-18 09:30:01 +08:00
sangelxiu1 f7a94d6690 ## Fix - 兼容空体系 2025-08-18 09:20:48 +08:00
woody 074481d5cc fix(SaOrderSync):全网商品管理-同步失败订单移除AccessPermission 2025-08-15 09:09:11 +08:00
cabbage f2758e5d8f ## 发货清单仓储导入修改模板; 2025-08-15 09:09:11 +08:00
woody 9b2bebfb44 feat(SaOrderSync): 全网商品管理-同步失败订单列表 2025-08-15 09:09:11 +08:00
cabbage ba967017b1 ## 产品库存同步实体添加SEQ; 2025-08-15 09:09:05 +08:00
woody e5f2bf71f5 feat(CuMemberWithdrawVO): 提现明细导出个税改为服务费、移除美金字段 2025-08-15 09:09:05 +08:00
cabbage b25379c1e3 ## 同步产品库存失败添加日志; 2025-08-15 09:09:04 +08:00
cabbage 376f60a715 ## 全部合单处理非在售商品; 2025-08-15 09:08:44 +08:00
cabbage f8e85ef122 ## 全网产品同步添加开关控制; 2025-08-15 09:08:44 +08:00
cabbage f933ace30d ## 全网商品库存同步; 2025-08-15 09:08:43 +08:00
woody a137b071f5 feat(SaOrder): 订单详情添加架构字段 2025-08-15 09:08:39 +08:00
cabbage 9bf22cf438 ## 全网产品管理; 2025-08-15 09:08:38 +08:00
cabbage 3b5349e680 ## 全网产品管理; 2025-08-15 09:08:38 +08:00
cabbage ca8c200a88 ## 添加数据来源枚举接口; 2025-08-15 09:08:38 +08:00
cabbage 98e0bbcd56 ## 全网产品添加删除操作;全网产品明细添加操作时间查询显示; 2025-08-15 09:08:33 +08:00
cabbage 1b3804724e ## 全网产品管理; 2025-08-15 09:08:33 +08:00
woody 1d68332939 fix(SaOrderMapper): 修复加购为0时,sql报错的问题 2025-08-15 09:08:32 +08:00
cabbage f12b6e277d ## 商品订单添加加购条件; 2025-08-15 09:08:28 +08:00
cabbage be571b952f ## 未合单添加非在售商品查询; 2025-08-15 09:08:28 +08:00
cabbage db063cfca0 ## 非在售商品列表接口; 2025-08-15 09:08:28 +08:00
woody a34648baee fix(SaOrderSync):全网商品管理-同步失败订单移除AccessPermission 2025-08-14 09:51:48 +08:00