3
0
Fork 0
Commit Graph

315 Commits

Author SHA1 Message Date
cabbage 7fe6c4998e ## 去掉旧短信;部分枚举国际化处理; 2025-08-12 18:37:58 +08:00
woody bc845181a5 feat(CuMemberWithdrawVO): 提现明细导出税费改服务费 2025-08-12 18:08:41 +08:00
sangelxiu1 4a890936db Merge remote-tracking branch 'origin/dev' into dev 2025-08-12 17:11:43 +08:00
sangelxiu1 bd50d74fb5 ## Opt - 可重复选择区域 2025-08-12 17:11:36 +08:00
cabbage 1bdedf3e0d ## 全网产品库存同步; 2025-08-12 16:44:19 +08:00
sangelxiu1 a43f571940 ## Feat - 收益区域&配送中心 2025-08-12 15:50:59 +08:00
sangelxiu1 975b419cf9 ## Feat - 收益区域&配送中心 2025-08-12 14:26:34 +08:00
cabbage 979970fefe Merge remote-tracking branch 'origin/dev' into dev 2025-08-12 09:39:39 +08:00
cabbage 8b5da3c010 ## 余额汇总语句修改; 2025-08-12 09:39:33 +08:00
sangelxiu1 e1cc436284 ## Opt - 不验证已选数量 2025-08-07 12:04:19 +08:00
cabbage f017daaf64 ## 提货订单不需要处理业绩、奖金; 2025-08-05 14:44:48 +08:00
cabbage 5b13979b08 ## 调整计算等级盒数处理; 2025-08-05 13:52:37 +08:00
cabbage b67683a1c7 ## 调整计算等级盒数处理; 2025-08-05 13:47:39 +08:00
cabbage f59bb9000e ## 迁移仓储导出; 2025-08-05 13:40:32 +08:00
cabbage ba92fa8d68 ## 注册、升级根据商品上传盒数计算等级; 2025-08-05 11:56:56 +08:00
cabbage e6cc920354 ## 商品管理添加上传盒数字段; 2025-08-05 11:46:41 +08:00
cabbage 47281e4d6a ## 商品管理添加上传盒数字段; 2025-08-05 11:25:57 +08:00
cabbage f17367b2c1 ## 充值提货卡去签呈; 2025-08-05 11:09:54 +08:00
cabbage b70b873412 ## 提货下单处理提货数量; 2025-08-05 10:34:38 +08:00
cabbage 8f1c7c8c14 ## 提货中心相关流程; 2025-08-05 09:23:01 +08:00
cabbage 6e047194ce ## 分公司等级注册、升级订单不需要发货流程单独处理,产品进入到提货专区; 2025-08-04 15:38:47 +08:00
sangelxiu1 972d18549e ## Opt - 商品自定义排序 2025-07-21 09:27:12 +08:00
sangelxiu1 3fa3725101 ## Feat - 京东支付 2025-07-16 09:11:21 +08:00
cabbage 712fda3fdf ## 奖金发放处理; 2025-07-14 16:05:30 +08:00
sangelxiu1 59216b24d5 Merge remote-tracking branch 'origin/dev' into dev 2025-07-14 11:08:36 +08:00
sangelxiu1 c902b720c2 ## Opt - 无需验证当前用户ID 2025-07-14 11:08:29 +08:00
cabbage b9472479cc ## 撤单处理取消区域配置; 2025-07-14 10:14:55 +08:00
cabbage 443dbbe4b8 ## 自助撤单处理推荐人等级; 2025-07-14 09:40:48 +08:00
sangelxiu1 1df74dedba Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/ICuMemberRetailRegionService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailRegionServiceImpl.java
2025-07-14 09:13:40 +08:00
sangelxiu1 1ee7f13ca1 ## Opt - 平铺区域数据 2025-07-14 09:12:44 +08:00
cabbage 4e813f17b9 ## 自助撤单处理推荐人等级;去掉条码校验; 2025-07-12 16:24:23 +08:00
cabbage 9b225459a0 ## 注册订单撤单处理推荐人等级; 2025-07-12 16:02:59 +08:00
cabbage 1814abf5f9 ## 复购级差奖金显示调整(269); 2025-07-12 15:21:32 +08:00
cabbage 8b9f461c20 ## 撤单处理推荐人等级; 2025-07-12 15:16:30 +08:00
cabbage f4ef2a9326 ## 首购级差处理逻辑优化; 2025-07-12 14:17:38 +08:00
cabbage d0781ce37a ## 复购级差计算先乘再减; 2025-07-12 11:54:50 +08:00
cabbage 3ebcfca6f7 ## 去掉复购专区限购和部分撤单处理; 2025-07-12 10:41:37 +08:00
cabbage e1943603de ## 会员端奖金显示字段调整; 2025-07-12 09:49:22 +08:00
cabbage 8ba98c5118 ## 空单注册返回等级处理(257); 2025-07-12 09:38:03 +08:00
cabbage 7819281f53 ## 去掉结算奖衔相关入库操作;去掉部分不需要奖金基础数据查询; 2025-07-12 09:33:44 +08:00
cabbage 40992e2b4c ## 修改限购提示(366); 2025-07-11 18:09:18 +08:00
cabbage c1cbe71ba6 ## 后台奖金显示处理; 2025-07-11 18:01:55 +08:00
cabbage 0bc5b3fc56 ## 注册、升级订单添加区域选择处理; 2025-07-11 16:36:13 +08:00
cabbage a423df3ec8 ## 去掉部分不用的业绩、区域考核等;调整部分接口参数; 2025-07-11 14:42:52 +08:00
cabbage 0ab028638d Merge remote-tracking branch 'origin/dev' into dev 2025-07-10 17:03:17 +08:00
cabbage ae9c04361a ## 结算日奖;商品列表添加团队校验; 2025-07-10 17:03:07 +08:00
sangelxiu1 43fd4cb92b ## Feat - 设置收益区域 2025-07-10 16:31:10 +08:00
sangelxiu1 9b65d2bc58 ## Feat - 收益区域接口 2025-07-10 13:53:22 +08:00
sangelxiu1 12e56687f0 ## Feat - 收益区域接口 2025-07-10 13:53:03 +08:00
sangelxiu1 b5b8132a7e ## Feat - 增加等级值 2025-07-10 11:10:33 +08:00
sangelxiu1 a8522ea109 ## Feat - 还原方法 2025-07-10 10:53:25 +08:00
cabbage 79e0ef0955 ## 去掉国家和行政区划点亮字段; 2025-07-10 09:08:30 +08:00
cabbage e3dc6b251f ## 购买博羚店主,添加推荐人升级高级店主处理; 2025-07-09 16:32:27 +08:00
cabbage d4ce7fb9c2 ## 调整等级; 2025-07-08 17:28:35 +08:00
cabbage c8f78e8480 ## 去掉秒结;部分国际化处理; 2025-07-08 16:49:30 +08:00
cabbage 304ccac431 ## 调整部分接口返回国际化; 2025-07-08 14:41:41 +08:00
cabbage 21a2db7a93 ## 等级、复购级差添加到7级; 2025-07-08 14:26:46 +08:00
cabbage 1373947c10 ## 去掉供应链涉及内容; 2025-07-07 17:33:16 +08:00
cabbage f2242b0161 ## 去掉部分不需要内容; 2025-07-07 15:03:09 +08:00
cabbage 6bf49f16ce ## 商品对指定会员可见; 2025-07-03 13:47:21 +08:00
sangelxiu1 9611e6f5b1 ## Opt - 办理业务->修改结算等级,分公司绑定省 2025-06-23 14:01:24 +08:00
cabbage 2b2000d769 ## 去掉不需要内容; 2025-06-21 11:16:18 +08:00
sangelxiu1 cdcd05ff4b Merge remote-tracking branch 'origin/dev' into dev 2025-06-21 09:59:53 +08:00
sangelxiu1 277c51dade ## Fix - 增加获取省级接口&办理业务时增加验证 2025-06-21 09:59:43 +08:00
cabbage f71826c676 ## 注册、升级订单等级处理修改; 2025-06-21 09:21:02 +08:00
woody 38910b22fc feat(CuMember): 会员列表移除奖项及收益区域字段 2025-06-20 17:04:18 +08:00
cabbage 65d95f3195 ## 部分接口及内容修改; 2025-06-20 16:23:07 +08:00
cabbage 601ca0de92 ## 部门枚举接口去掉国际化; 2025-06-20 14:57:56 +08:00
sangelxiu1 00fffa4c93 ## Fix - 订单主动收货 2025-06-20 14:21:34 +08:00
cabbage 85fb8a787c ## 初始化项目; 2025-06-20 10:18:26 +08:00
cabbage 17e5a70f85 ## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理; 2025-06-19 16:06:30 +08:00
cabbage 7a17c2127e ## get-info返回分红奖衔; 2025-06-19 15:39:54 +08:00
cabbage a35e468103 ## 秒结、日结恢复分红奖衔; 2025-06-19 15:30:23 +08:00
sangelxiu1 f7f995c9c3 ## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝 2025-06-19 13:38:58 +08:00
cabbage 164a336558 ## 替换国际化处理; 2025-06-18 16:46:04 +08:00
cabbage dfc21bc3bd ## 等级枚举不走国际化; 2025-06-18 16:35:12 +08:00
cabbage e623987b61 Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 11:22:26 +08:00
cabbage af9a71f31a ## 调整部门获取下个编号方法; 2025-06-18 11:22:21 +08:00
sangelxiu1 8804791eca Merge remote-tracking branch 'origin/dev' into dev 2025-06-18 11:06:44 +08:00
sangelxiu1 f4e2d9a16d ## Fix - 自动登录,获取systemType异常 2025-06-18 11:06:38 +08:00
cabbage 2feb0076e1 ## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法; 2025-06-18 10:55:44 +08:00
cabbage 7bf86ffad5 ## 处理业绩表方法; 2025-06-17 17:33:53 +08:00
cabbage 3c679ce8a8 ## 推荐正反查调整处理方式; 2025-06-17 17:28:17 +08:00
cabbage f79e4a7ab6 ## 真实奖衔分析、等级升级查询; 2025-06-17 16:57:14 +08:00
cabbage 45e3ec095c ## 去掉旧抗衰达人,调整推荐相关列表; 2025-06-17 16:03:53 +08:00
cabbage e89e09371f ## 等级修改、0元注册、删除空点相关接口调整; 2025-06-17 15:43:29 +08:00
sangelxiu1 52f8a8585f Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 13:58:24 +08:00
sangelxiu1 03780c8925 ## Fix - 盒数计算大小区后排除注水 2025-06-17 13:58:19 +08:00
cabbage 13ee5b8ee1 ## 判断升级时,添加本身注水盒数处理; 2025-06-17 13:21:31 +08:00
cabbage 555bfecd30 ## 调整等级判断处理,注水单独处理; 2025-06-17 11:26:08 +08:00
sangelxiu1 b84e3439ee Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 11:08:13 +08:00
sangelxiu1 b425609f79 ## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水 2025-06-17 11:08:06 +08:00
cabbage 34b1b8632a ## 日结添加团队月盒数字段及处理;月奖查询订单不走dubbo服务,改为自查询; 2025-06-17 10:46:35 +08:00
sangelxiu1 2bd224b3d4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-17 09:39:32 +08:00
sangelxiu1 2615f517de ## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM) 2025-06-17 09:39:25 +08:00
cabbage f4899490de ## 更新奖衔语句问题处理; 2025-06-16 15:00:28 +08:00
cabbage 174fe27340 ## 更新奖衔语句问题处理; 2025-06-16 14:51:42 +08:00
cabbage ad8c536b68 Merge remote-tracking branch 'origin/dev' into dev 2025-06-16 10:09:49 +08:00
cabbage b386dda7ba ## 等级处理改为逻辑删除; 2025-06-16 10:09:45 +08:00
sangelxiu1 344f10a3e1 Merge remote-tracking branch 'origin/dev' into dev 2025-06-16 10:00:16 +08:00
sangelxiu1 9020247e9a ## Fix - 市场动态-业绩列表为0 2025-06-16 10:00:11 +08:00
cabbage 73b70e4fa0 ## 自己月累计业绩处理; 2025-06-16 09:56:33 +08:00
cabbage 7cb0035eb7 ## 奖衔处理全部改为逻辑删除和查询; 2025-06-16 09:44:45 +08:00
cabbage 5ebfd640c2 ## 新需求,注册、升级支付多送两级; 2025-06-16 09:31:10 +08:00
cabbage e0fafbe410 ## 收货地址调整注释; 2025-06-16 09:09:50 +08:00
cabbage 4ae4b5178e ## 是否支付为空校验; 2025-06-16 08:54:40 +08:00
cabbage b9ddee109f ## 新需求,注册、升级支付多送两级; 2025-06-14 16:31:35 +08:00
sangelxiu1 ea76dfab3b Merge remote-tracking branch 'origin/dev' into dev 2025-06-14 14:08:40 +08:00
sangelxiu1 7f03ef8e7a ## Fix - 市场动态-小区业绩[bugID=197【H5】如截图,RE55691589这个会员的市场动态里,红框中的盒数和业绩应该有值才对] 2025-06-14 14:08:33 +08:00
cabbage c26b132642 ## 空单注册报错处理(195); 2025-06-14 14:07:03 +08:00
cabbage c98511ecb3 ## 修改户籍短信校验调整(181); 2025-06-14 13:29:18 +08:00
cabbage 836b1fbdea ## 空单注册是否激活处理(195); 2025-06-14 11:10:24 +08:00
sangelxiu1 3df2c1b987 ## Fix - 市场动态-小区业绩 2025-06-14 10:46:33 +08:00
sangelxiu1 7a88013554 ## Fix - 本月=昨日月 + 今日个人 + 今日团队 2025-06-14 09:55:24 +08:00
sangelxiu1 b0658f1bc3 Merge remote-tracking branch 'origin/dev' into dev 2025-06-14 09:47:41 +08:00
sangelxiu1 06653aaa9a ## Opt - 调整去除注水的位置 2025-06-14 09:47:34 +08:00
cabbage 2f6e9da598 ## 计算会员等级直推会员不算注水;奖金公布接口调整; 2025-06-14 09:47:07 +08:00
cabbage da6ffb525d Merge remote-tracking branch 'origin/dev' into dev 2025-06-14 09:45:38 +08:00
cabbage 19de07fd43 ## get-info返回会员荣誉奖衔; 2025-06-14 09:45:28 +08:00
sangelxiu1 68141eb9ff Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 18:25:13 +08:00
sangelxiu1 02453df49a ## Opt - 市场动态-查询条件 2025-06-13 18:25:06 +08:00
cabbage 634f657163 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 18:18:42 +08:00
cabbage 0e2a1f2571 ## 复购商品区域分红按指定的价格进行处理; 2025-06-13 18:18:37 +08:00
sangelxiu1 9d6fd9b7a8 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 18:14:19 +08:00
sangelxiu1 f0a8c658f5 ## Opt - 业绩独立大小区条件&市场动态列表接口 2025-06-13 18:14:13 +08:00
cabbage 503d993540 ## 累积盒数处理循环修改; 2025-06-13 18:07:58 +08:00
cabbage c410d4faa4 ## 商品管理添加复购区域分红; 2025-06-13 17:52:00 +08:00
cabbage d2474562db ## 伞下直推业绩统计报错(178); 2025-06-13 16:57:46 +08:00
cabbage 7403bb2b86 ## 户籍变更不需要处理手续费(181); 2025-06-13 16:43:40 +08:00
cabbage 6354b2aa09 ## 忘记密码支持多手机号(182); 2025-06-13 16:35:29 +08:00
sangelxiu1 287cc279b4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 15:25:58 +08:00
sangelxiu1 5577de14e5 ## Fix - 盒数大小区逻辑 2025-06-13 15:25:51 +08:00
cabbage f98a1fe2af ## 奖金明细去掉分页; 2025-06-13 15:12:10 +08:00
sangelxiu1 f74abd210f ## Opt - 市场动态部分代码 2025-06-13 15:06:26 +08:00
sangelxiu1 8a87410289 ## Fix - 选择区域 计算自己业绩 2025-06-13 15:05:47 +08:00
sangelxiu1 be32dd5151 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 15:03:45 +08:00
sangelxiu1 bb175563f5 ## Fix - 选择区域 计算自己业绩 2025-06-13 15:03:40 +08:00
cabbage d2cdceec1c Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 14:33:56 +08:00
cabbage 2543767de6 ## 平级收益价格按单商品处理; 2025-06-13 14:33:51 +08:00
sangelxiu1 bfff613752 ## Opt - mq补偿增加业绩 2025-06-13 14:33:09 +08:00
sangelxiu1 d1a4f364ca Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 14:32:33 +08:00
sangelxiu1 401adc07e0 ## Opt - mq补偿增加业绩 2025-06-13 14:32:27 +08:00
cabbage 3f66820e55 ## 奖金明细、奖金汇总接口调整; 2025-06-13 14:16:09 +08:00
sangelxiu1 cf7924b143 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 13:52:59 +08:00
sangelxiu1 e0921965a7 ## Opt - 我的->盒数
业绩除万,四位小数
2025-06-13 13:52:53 +08:00
cabbage 01606f64bd ## 计算平级时,保留6位小数; 2025-06-13 13:24:59 +08:00
cabbage 1d31ef09a5 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 12:02:57 +08:00
cabbage 2411a8d22c ## 查询昨日奖金汇总接口; 2025-06-13 12:02:53 +08:00
sangelxiu1 8d3408c421 ## Opt - 我的->盒数
增加激活时间判断 & 计算达小区时包含注水,返回前台数据时剔出注水
2025-06-13 12:02:06 +08:00
sangelxiu1 ac6dc2c5cd Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 11:41:17 +08:00