Commit Graph

444 Commits

Author SHA1 Message Date
zhangheng df7575c53d ## 删除死点添加日志 2025-09-11 13:55:39 +08:00
zhangheng a749c22b62 ## 删除死点 2025-09-11 11:30:06 +08:00
zhangheng 53ec7d39d3 ## bug373 双轨的业绩汇总 复购没有加秒杀的业绩 2025-09-10 16:42:43 +08:00
zhangheng 8ca12af0bb ## 删除死点 2025-09-10 16:42:41 +08:00
cabbage b5bd3b5efb ## 0元会员注册相关接口;get-info返回信息调整; 2025-09-10 16:42:32 +08:00
zhangheng 253436e347 ## 调换货物校验,校验订单原订单价格和调换完货之后的价格不相同不进行换货 2025-09-10 16:42:19 +08:00
zhangheng d76498a3ed ## bug371 业绩汇总页,选了隶属体系搜索后点导出,导出的excel是所有的,应该只导出当前搜索的体系的 2025-09-09 14:37:48 +08:00
cabbage a65fbea4ab ## 见点奖考核添加复购考核时间判断处理; 2025-09-09 09:31:38 +08:00
cabbage 5bb38cdd04 ## 1980升级的9900可以再购买9900但是等级不变(363); 2025-09-04 16:06:36 +08:00
cabbage c04cc9918b ## 提现走绑定银行卡逻辑;银行卡添加4要素认证; 2025-09-04 14:55:30 +08:00
cabbage d1cf73003c ## 1980升级的9900可以再购买9900但是等级不变(363); 2025-09-04 14:55:30 +08:00
cabbage 02a0e48b78 ## 创建考核月表语句调整; 2025-09-02 10:32:41 +08:00
cabbage 26dcb2205d ## 兼容调换货产品之后的发货清单; 2025-09-02 09:47:26 +08:00
cabbage e34bb3ded2 ## 总裁看板复购添加秒杀订单统计; 2025-09-02 09:47:26 +08:00
cabbage 5780d1ac9e ## 188实际支付不能使用政策币; 2025-08-28 09:16:36 +08:00
cabbage d4aec35734 ## 专区商品列表添加等级、奖衔权限判断; 2025-08-27 10:51:28 +08:00
cabbage 80f27bbec8 ## 订单详情导出添加商品类型; 2025-08-27 09:07:04 +08:00
cabbage eaa1f6f80d ## 订单查询不强制判断体系必须存在; 2025-08-27 09:07:04 +08:00
cabbage a1c9f83862 ## 提现添加身份证号;调整导出与列表对齐; 2025-08-20 10:00:39 +08:00
cabbage bfacb495c4 ## 仓储导出排序调整; 2025-08-18 14:11:23 +08:00
cabbage 307cf73c58 ## 直播出现问题修复; 2025-08-18 10:13:21 +08:00
cabbage d6d92d23cc ## 直播出现问题修复; 2025-08-18 09:36:59 +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 f7a94d6690 ## Fix - 兼容空体系 2025-08-18 09:20:48 +08:00
woody 05b6ca0605 fix(SaOrderSync):全网商品管理-同步失败订单移除AccessPermission 2025-08-14 09:31:50 +08:00
cabbage 7914bb4405 ## 发货清单仓储导入修改模板; 2025-08-13 18:02:17 +08:00
woody a53edf9cf9 feat(SaOrderSync): 全网商品管理-同步失败订单列表 2025-08-13 16:23:54 +08:00
woody 589c86d0e8 Merge branch 'bd_dev' of gitee.com:cabbage_qd/java-base-app into bd_dev 2025-08-12 17:48:20 +08:00
woody 88b79785de feat(CuMemberWithdrawVO): 提现明细导出个税改为服务费、移除美金字段 2025-08-12 17:47:07 +08:00
cabbage e1e13fa224 ## 同步产品库存失败添加日志; 2025-08-12 15:51:06 +08:00
cabbage 3a28ba22a5 ## 全部合单处理非在售商品; 2025-08-12 10:08:49 +08:00
cabbage cab7112dd2 ## 全网产品同步添加开关控制; 2025-08-12 09:21:43 +08:00
cabbage 8a4869e7c4 ## 全网商品库存同步; 2025-08-11 18:00:55 +08:00
woody 7fc9dec520 feat(SaOrder): 订单详情添加架构字段 2025-08-11 17:48:01 +08:00
woody cbe0dd3ac5 fix(SaOrderMapper): 修复加购为0时,sql报错的问题 2025-08-11 16:11:46 +08:00
cabbage bfc02d048e ## 商品订单添加加购条件; 2025-08-11 14:54:30 +08:00
cabbage 7bb2b0c01c ## 未合单添加非在售商品查询; 2025-08-11 14:03:11 +08:00
cabbage f1f356b279 ## 非在售商品列表接口; 2025-08-11 11:44:57 +08:00
cabbage e0127a6a52 ## 188订单会员注册业绩为订单业绩; 2025-08-11 09:21:42 +08:00
cabbage 2703b1e5e6 ## 注册列表188显示金额业绩(349); 2025-08-11 09:18:08 +08:00
cabbage dd9a31b0ef ## 全网产品管理; 2025-08-09 17:02:17 +08:00
cabbage 79fbb915a2 ## 全网产品管理; 2025-08-09 16:51:35 +08:00
cabbage 3bc0452bfa ## 添加数据来源枚举接口; 2025-08-09 16:14:20 +08:00
cabbage 39d070d638 ## 全网产品添加删除操作;全网产品明细添加操作时间查询显示; 2025-08-09 14:21:43 +08:00
cabbage d9dd0eb731 ## 全网产品管理; 2025-08-09 13:49:43 +08:00
woody 61ee8251de fix(CuBonusStatis): 导出接口移除PV列 2025-08-08 17:56:50 +08:00
cabbage 1c1b620899 ## 顶点奖金拨比汇总封顶人数计算,去掉扩展收益为0的; 2025-08-08 17:26:10 +08:00
cabbage 613aeff751 ## 产品列表添加仓储编号显示及查询条件; 2025-08-08 14:48:23 +08:00
woody f5b21f330f fix(MemberReportMapper): 修复产品销售统计接口报错问题 2025-08-08 14:38:32 +08:00
cabbage 555931baa4 ## 去掉不需要的实体; 2025-08-08 14:11:55 +08:00
cabbage cb35f82e81 ## 产品列表添加仓储编号显示及查询条件; 2025-08-08 14:10:22 +08:00
cabbage 3686020109 ## 产品销售统计详情; 2025-08-08 13:57:54 +08:00
cabbage 33a1d2a942 ## 出货明细汇总统计改为产品销售统计; 2025-08-08 11:56:04 +08:00
cabbage 8079e50a01 ## 部分枚举去掉国际化; 2025-08-07 15:37:17 +08:00
cabbage dd859d7966 ## 调整国际化; 2025-08-07 15:13:06 +08:00
cabbage 7e472411ab ## 变更户籍,重置会员生日; 2025-08-07 15:09:12 +08:00
cabbage ef0f4e7b18 ## 变更户籍,重置会员生日; 2025-08-07 15:01:24 +08:00
cabbage 3720d6b608 ## 实名认证同步更新生日;会员真实信息列表优化; 2025-08-07 14:59:07 +08:00
cabbage 4558c385d8 ## 指定体系比例1440:1440; 2025-08-07 11:45:24 +08:00
cabbage 804874a6d8 ## 去掉秒杀不需要代码; 2025-08-07 10:56:50 +08:00
cabbage 6bc93e8315 ## 隐藏不需要的订单专区显示; 2025-08-07 09:46:57 +08:00
cabbage 9c316330fa ## 会员端实名认证;户籍变更修改; 2025-08-06 18:02:31 +08:00
cabbage 7778c004ba ## 自助服务权限接口调整; 2025-08-06 17:20:01 +08:00
cabbage dd26c901fa ## 实名认证接口调整;三方实名接口调整; 2025-08-06 17:13:46 +08:00
cabbage c33d8e24a8 ## 秒杀订单撤单处理(346、347); 2025-08-06 15:38:25 +08:00
cabbage 582aee118c ## 待支付秒杀订单,再支付时进行限购校验; 2025-08-06 14:24:24 +08:00
cabbage 4740130d28 ## 待支付秒杀订单,再支付时进行限购校验; 2025-08-06 14:08:32 +08:00
cabbage 72c5c564ff ## 会员月限购处理调整(343); 2025-08-06 10:41:06 +08:00
sangelxiu1 61e7ec003d ## Fix - 月限购验证时间由(支付时间)调整为(当前时间)[验证在下单前,还没有支付时间] 2025-08-06 09:27:35 +08:00
cabbage dd71caa701 ## 限购更新库存;添加秒杀订单消费明细; 2025-08-05 16:41:26 +08:00
cabbage 1717118326 ## 下单报错处理(342); 2025-08-05 16:04:21 +08:00
cabbage dab7999c9c ## 秒杀订单按复购走业绩和奖金处理;秒杀订单拨比算在复购里面; 2025-08-05 15:15:08 +08:00
cabbage 8d3a33206c ## 秒杀专区下单逻辑处理; 2025-08-05 14:26:17 +08:00
sangelxiu1 80a5eadb9a Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-08-01 15:43:25 +08:00
sangelxiu1 28bbd5064d ## Feat - 秒杀专区销售数量 2025-08-01 15:43:13 +08:00
cabbage de598ff027 ## 区域月考核兼容处理; 2025-08-01 14:37:39 +08:00
cabbage 9c1a6995b7 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-08-01 14:06:16 +08:00
cabbage c9fbd00fd6 ## 区域月考核兼容处理; 2025-08-01 14:06:06 +08:00
sangelxiu1 0c799715d7 ## Opt - 增加可不验证PV条件[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=336] 2025-08-01 10:47:02 +08:00
sangelxiu1 80105c11fd Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-08-01 09:50:41 +08:00
sangelxiu1 36eece6446 ## Opt - 增加可不验证PV条件[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=336] 2025-08-01 09:50:28 +08:00
cabbage dc9f367c04 ## 初始化考核数据调整; 2025-07-31 18:46:43 +08:00
cabbage 837ceb2129 ## 加购满3赠3,满4不赠,满6贈6; 2025-07-31 15:13:45 +08:00
cabbage 531f5a5cd7 ## 添加秒杀专区;商品添加秒杀专区字段;去掉部分乐学代金券逻辑;去掉部分枚举国际化; 2025-07-30 17:28:02 +08:00
cabbage 0a2a773c7c ## 去掉不需要国际化的枚举; 2025-07-30 15:11:06 +08:00
cabbage cd8140a1f7 ## 考核处理改为全员考核处理; 2025-07-30 15:08:01 +08:00
cabbage 96967927b3 ## 考核列表映射字段修改; 2025-07-30 10:51:16 +08:00
cabbage f2f09a4ad4 ## 区域考核数据处理; 2025-07-30 10:18:33 +08:00
cabbage dba0283246 ## 查询区域列表时间方法调整; 2025-07-30 09:48:09 +08:00
cabbage 3cd101971e ## 会员考核列表; 2025-07-30 09:29:58 +08:00
cabbage db0e0473a8 ## 188没有加购商品提示修改(333); 2025-07-30 08:47:12 +08:00
cabbage 609d5bb2fe ## 处理加购注册、升级; 2025-07-29 18:02:33 +08:00
cabbage 0b70700e53 ## 最新订单对应等级处理调整; 2025-07-29 17:26:54 +08:00
cabbage e2a907f775 ## 考核月表添加考核会员实时奖衔记录; 2025-07-29 16:50:38 +08:00
cabbage 377b64f1e8 ## 升级报错处理(331); 2025-07-29 16:30:43 +08:00
cabbage 26fd52437e ## 修改返回提示信息(330); 2025-07-29 16:27:32 +08:00
cabbage 62219fbf46 ## 校验加购使用实际购买等级; 2025-07-29 15:31:29 +08:00
cabbage 2ecc56f64e ## 修改为POST方式; 2025-07-29 15:22:01 +08:00
cabbage 1cf709ee61 ## 添加商品加购处理; 2025-07-29 15:08:45 +08:00