Commit Graph

485 Commits

Author SHA1 Message Date
sangelxiu1 d00c3bc327 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-09-24 10:21:31 +08:00
sangelxiu1 533ef4797f ## Feat - Top 30 (直推人数/直推金额) - 后台管理状态 2025-09-24 10:21:23 +08:00
zhangheng 0dbe162d7f Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-09-24 10:11:13 +08:00
zhangheng 1532667354 ## 直推升级数据,导出日期格式化修改 2025-09-24 10:11:03 +08:00
cabbage 2a92a63378 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-09-24 10:05:22 +08:00
cabbage bda322f0bf ## 去掉乐学相关订单处理; 2025-09-24 10:05:12 +08:00
zhangheng 84e54d0236 ## 直推升级数据,导出 2025-09-24 09:59:45 +08:00
cabbage 7f444421b7 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-09-24 09:14:26 +08:00
cabbage ff2f6f30c1 ## 直推升级撤单降级; 2025-09-24 09:14:19 +08:00
zhangheng 8959ba3663 ## 直推升级数据 2025-09-23 17:56:25 +08:00
zhangheng 74d8af7669 ## 直推升级活动 2025-09-23 16:57:29 +08:00
sangelxiu1 7e9cc1289c ## Feat - Top 30 (直推人数/直推金额) 2025-09-23 16:52:09 +08:00
cabbage 94e5b845a2 ## 推3升一级活动正向; 2025-09-23 16:43:08 +08:00
cabbage 9dcd553d07 ## 推3升一级活动正向; 2025-09-23 16:35:08 +08:00
cabbage 7d174ffed5 ## 新建活动类型; 2025-09-23 15:11:10 +08:00
cabbage 3c4fb1f406 ## 去掉不需要的活动代码; 2025-09-23 14:32:01 +08:00
cabbage be546a006d ## 去掉接口不需要的返回信息; 2025-09-23 14:12:23 +08:00
cabbage f669b3ffda ## 后台看板添加0元会员处理; 2025-09-23 11:04:42 +08:00
cabbage ea35a28f5f ## 0元以及188不累计业绩写反调整; 2025-09-23 09:25:11 +08:00
cabbage f5d9ebf5dc ## 生产截止10.1,测试截止9.23,之前赠送等级之后不赠送; 2025-09-22 11:37:12 +08:00
zhangheng b29fe428f6 ## 营销活动接口添加日志 2025-09-18 10:33:12 +08:00
zhangheng 9295df4c5e ## 充值已购买次数,充值未购买次数取消签呈 2025-09-18 09:36:35 +08:00
zhangheng 4093e0716d ## 营销管理抽奖配置,直推赠送,旅游活动取消签呈流程 2025-09-17 11:59:24 +08:00
cabbage 8692a233fe ## 会员手机号唯一会员姓名校验; 2025-09-17 10:04:52 +08:00
cabbage e426c3b8d5 ## 0元会员注册次数限制(379); 2025-09-17 09:59:02 +08:00
cabbage 0b5494e21d ## 0元会员不能分享;0元会员不能做为推荐人、安置人; 2025-09-17 09:51:20 +08:00
zhangheng b1e00a4d17 ## 营销管理取消签呈流程日志添加 2025-09-16 13:52:23 +08:00
zhangheng 6693d44a27 ## 营销管理取消签呈流程 2025-09-16 13:52:22 +08:00
cabbage ff3cbac038 ## 0元购买188在线支付回调; 2025-09-16 12:03:00 +08:00
cabbage 7650d22575 ## 0元购买188在线支付回调; 2025-09-16 11:58:36 +08:00
cabbage 81bb6cb542 ## 转账、提现添加账户金额是否足够校验; 2025-09-16 11:24:11 +08:00
cabbage bf2554ee3b ## 0元购买188在线支付回调; 2025-09-16 11:06:53 +08:00
cabbage 625b6eb2e6 ## 0元会员不计算奖金; 2025-09-15 17:16:29 +08:00
zhangheng 5ebe4bc601 ## 删除死点删除值修改 2025-09-15 17:15:59 +08:00
cabbage b37fd5dd55 ## 日业绩统计添加复购新増业绩处理; 2025-09-15 17:15:56 +08:00
cabbage 5968a63f0a ## 商品分类如果为空返回空对象; 2025-09-15 17:01:33 +08:00
cabbage cc80c6f1fe ## 0元会员只能购买188流程; 2025-09-15 16:47:50 +08:00
cabbage d25b59b79c ## 日业绩统计添加复购新増业绩处理; 2025-09-15 14:34:05 +08:00
zhangheng a34fd94c44 ## 删除死点优化 2025-09-12 09:57:42 +08:00
zhangheng cd36cdd586 ## 删除死点代码优化 2025-09-12 09:57:41 +08:00
zhangheng 8c62bcf380 ## 删除死点添加日志 2025-09-12 09:57:41 +08:00
zhangheng 1192bea7a4 ## 删除死点 2025-09-12 09:57:41 +08:00
zhangheng 69e092e5bc ## bug373 双轨的业绩汇总 复购没有加秒杀的业绩 2025-09-10 16:13:54 +08:00
cabbage d133aa0e5f ## 0元会员注册相关接口;get-info返回信息调整; 2025-09-10 14:48:30 +08:00
zhangheng 11a5a8f758 ## 删除死点 2025-09-10 14:33:36 +08:00
zhangheng c872fc80fe ## 调换货物校验,校验订单原订单价格和调换完货之后的价格不相同不进行换货 2025-09-10 10:18:42 +08:00
zhangheng a69c4e70c1 Merge remote-tracking branch 'origin/bd_dev' into bd_dev 2025-09-09 14:34:14 +08:00
zhangheng dfb32bc389 ## bug371 业绩汇总页,选了隶属体系搜索后点导出,导出的excel是所有的,应该只导出当前搜索的体系的 2025-09-09 14:33:55 +08:00
cabbage 9bd687944c ## 见点奖考核添加复购考核时间判断处理; 2025-09-09 09:30:54 +08:00
cabbage 1fb311af01 ## 1980升级的9900可以再购买9900但是等级不变(363); 2025-09-04 16:06:16 +08:00
cabbage e864c21872 ## 提现走绑定银行卡逻辑;银行卡添加4要素认证; 2025-09-04 14:54:42 +08:00
cabbage 5ae87bebb0 ## 1980升级的9900可以再购买9900但是等级不变(363); 2025-09-03 14:37:53 +08:00
cabbage 8961125532 ## 创建考核月表语句调整; 2025-09-02 10:31:57 +08:00
cabbage c6b86a093d ## 兼容调换货产品之后的发货清单; 2025-09-02 09:46:22 +08:00
cabbage cb12579d70 ## 总裁看板复购添加秒杀订单统计; 2025-09-02 09:29:22 +08:00
cabbage a3cc0a5e15 ## 188实际支付不能使用政策币; 2025-08-28 09:15:36 +08:00
cabbage c7a4d7be16 ## 专区商品列表添加等级、奖衔权限判断; 2025-08-27 10:50:46 +08:00
cabbage b69793ab2a ## 订单详情导出添加商品类型; 2025-08-27 09:05:59 +08:00
cabbage d79cd0a91a ## 订单查询不强制判断体系必须存在; 2025-08-22 16:45:17 +08:00
cabbage 75ae4b8bcb ## 提现添加身份证号;调整导出与列表对齐; 2025-08-20 09:57:01 +08:00
cabbage 0d8e10fc21 ## 仓储导出排序调整; 2025-08-18 14:10:55 +08:00
cabbage cf1d8c7a71 ## 直播出现问题修复; 2025-08-18 10:12:39 +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