3
0
Fork 0
Commit Graph

335 Commits

Author SHA1 Message Date
sangelxiu1 cca882d4c8 ## Feat - 京东支付依赖打包插件 2025-07-16 09:23:05 +08:00
sangelxiu1 7105312311 ## Feat - 京东支付 2025-07-16 09:16:51 +08:00
cabbage e308911271 ## xxl-job配置修改; 2025-07-15 11:07:01 +08:00
cabbage 34af97c895 ## nacos配置修改; 2025-07-15 11:07:00 +08:00
cabbage 90ed09631f ## 奖金发放处理; 2025-07-14 16:07:16 +08:00
cabbage 721b297cbd ## 撤单处理取消区域配置; 2025-07-14 16:06:56 +08:00
sangelxiu1 f4f8cbb13f Merge remote-tracking branch 'origin/test' into test 2025-07-14 11:09:12 +08:00
sangelxiu1 9b1b143422 ## Opt - 无需验证当前用户ID 2025-07-14 11:09:02 +08:00
cabbage 0afa2dc051 ## 自助撤单处理推荐人等级; 2025-07-14 09:42:06 +08:00
sangelxiu1 5e21e19441 ## Opt - 平铺区域数据 2025-07-14 09:24:17 +08:00
cabbage 30b6468912 ## 自助撤单处理推荐人等级;去掉条码校验; 2025-07-12 16:36:47 +08:00
cabbage 26de66544b ## 注册订单撤单处理推荐人等级; 2025-07-12 16:36:46 +08:00
cabbage a97f519179 ## 复购级差奖金显示调整(269); 2025-07-12 15:22:47 +08:00
cabbage fcda6b1b77 ## 撤单处理推荐人等级; 2025-07-12 15:22:37 +08:00
cabbage 848d6a0756 ## 首购级差处理逻辑优化; 2025-07-12 15:22:34 +08:00
cabbage fc5826caf1 ## 去掉复购专区限购和部分撤单处理; 2025-07-12 15:22:27 +08:00
cabbage 5de0a3ee32 ## 复购级差计算先乘再减; 2025-07-12 11:56:43 +08:00
cabbage 6b9a114e60 ## 会员端奖金显示字段调整; 2025-07-12 09:50:49 +08:00
cabbage 3c36134d87 ## 空单注册返回等级处理(257); 2025-07-12 09:50:48 +08:00
cabbage 45a707adf0 ## 去掉结算奖衔相关入库操作;去掉部分不需要奖金基础数据查询; 2025-07-12 09:50:48 +08:00
cabbage 987a78b89d ## 修改限购提示(366); 2025-07-11 18:09:56 +08:00
cabbage 2d83335200 ## 后台奖金显示处理; 2025-07-11 18:09:56 +08:00
cabbage 526ffe6c49 ## 注册、升级订单添加区域选择处理; 2025-07-11 18:09:55 +08:00
cabbage d3ea099ef3 ## 去掉部分不用的业绩、区域考核等;调整部分接口参数; 2025-07-11 18:09:55 +08:00
cabbage 8f1c088250 ## 结算日奖;商品列表添加团队校验; 2025-07-11 11:29:16 +08:00
sangelxiu1 473a6379e5 ## Feat - 设置收益区域 2025-07-11 11:29:16 +08:00
sangelxiu1 db4ab68851 ## Feat - 收益区域接口 2025-07-11 11:29:15 +08:00
sangelxiu1 c6c30fd96d ## Feat - 收益区域接口 2025-07-11 11:29:15 +08:00
sangelxiu1 fc91a6a650 ## Opt - 数据结构 2025-07-11 11:29:14 +08:00
sangelxiu1 9f8ff2fe5d ## Feat - 增加等级值 2025-07-10 11:11:07 +08:00
sangelxiu1 5bb6f76495 ## Feat - 还原方法 2025-07-10 10:57:49 +08:00
cabbage 387ce2fc22 ## 去掉国家和行政区划点亮字段; 2025-07-10 09:10:54 +08:00
cabbage bc63691d9f ## 购买博羚店主,添加推荐人升级高级店主处理; 2025-07-10 09:10:53 +08:00
cabbage eaeb2b98fe ## 调整等级; 2025-07-10 09:10:53 +08:00
cabbage 4e635ec973 ## 去掉秒结;部分国际化处理; 2025-07-10 09:10:52 +08:00
cabbage 77e0682655 ## 等级改为7级; 2025-07-10 09:10:52 +08:00
cabbage 9eb193a67f ## 等级改为6级; 2025-07-10 09:10:52 +08:00
cabbage fe45274af3 ## 调整部分接口返回国际化; 2025-07-08 14:43:24 +08:00
cabbage 3bec39e68a ## 等级、复购级差添加到7级; 2025-07-08 14:43:24 +08:00
cabbage 96744abc37 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	bd-api/bd-api-system/src/main/java/com/hzs/system/base/IAreaServiceApi.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberTreeMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberTreeService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberTreeServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/controller/manage/CuBonusExpandController.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuBonusExpandMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushHisMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusPushMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareBonusMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberShareDetailMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuBonusExpandService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberBonusPushHisService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareBonusService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/ICuMemberShareDetailService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BdWaresBonusItemsServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleHandle.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleRangeHandle.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuBonusExpandServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusPushHisServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareBonusServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberShareDetailServiceImpl.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/mapper/CuMemberAssessMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/ICuMemberAssessService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/mapper/CuMemberRiskControlMapper.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/service/ICuMemberRiskControlService.java
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/risk/service/impl/CuMemberRiskControlServiceImpl.java
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/base/CuMemberAchieveLogMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuBonusExpandMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareBonusMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/bonus/CuMemberShareDetailMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAssessMapper.xml
#	bd-business/bd-business-bonus/src/main/resources/mapper/bonus/risk/CuMemberRiskControlMapper.xml
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java
#	bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
#	bd-business/bd-business-sale/src/main/java/com/hzs/activity/pick/service/IAcPickService.java
#	bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java
#	bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
#	bd-business/bd-business-system/src/main/java/com/hzs/system/base/provider/AreaServiceProvider.java
#	bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdAreaServiceImpl.java
#	bd-business/bd-business-system/src/main/java/com/hzs/system/sys/controller/manage/SysApprovalBusinessController.java
#	bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ScmMsgConstants.java
#	bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/bonus/risk/CuMemberRiskControl.java
#	bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareBonus.java
#	bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/bonus/CuMemberShareDetail.java
#	bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/ext/CuBonusExpandExt.java
#	bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/scm/ic/IcAvailableNum.java
2025-07-08 11:10:02 +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 fe5b30c646 ## 去掉不需要内容; 2025-06-21 11:28:36 +08:00
sangelxiu1 471174c751 ## Fix - 增加获取省级接口&办理业务时增加验证 2025-06-21 11:28:35 +08:00
cabbage f6356586c2 ## 注册、升级订单等级处理修改; 2025-06-21 11:28:20 +08:00
woody 68ef41e6b4 feat(CuMember): 会员列表移除奖项及收益区域字段 2025-06-21 11:28:19 +08:00
cabbage eace88d340 ## 部分接口及内容修改; 2025-06-21 11:28:16 +08:00
cabbage b65ac357af ## 部门枚举接口去掉国际化; 2025-06-21 11:28:16 +08:00