 cabbage
|
2d834a9aa1
|
## 等级改为6级；
|
2025-07-08 15:02:39 +08:00 |
|
cabbage
|
fe45274af3
|
## 调整部分接口返回国际化；
|
2025-07-08 14:43:24 +08:00 |
|
cabbage
|
3bec39e68a
|
## 等级、复购级差添加到7级；
|
2025-07-08 14:43:24 +08:00 |
|
cabbage
|
304ccac431
|
## 调整部分接口返回国际化；
|
2025-07-08 14:41:41 +08:00 |
|
cabbage
|
21a2db7a93
|
## 等级、复购级差添加到7级；
|
2025-07-08 14:26:46 +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 |
|
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 |
|
cabbage
|
f65f44c13f
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/MemberRetailServiceImpl.java
# bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/RetailMemberInfoVO.java
|
2025-06-20 14:27:15 +08:00 |
|
cabbage
|
c0509060ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-20 14:23:38 +08:00 |
|
cabbage
|
ec017257eb
|
## 定时任务配置；
|
2025-06-20 14:23:33 +08:00 |
|
sangelxiu1
|
00fffa4c93
|
## Fix - 订单主动收货
|
2025-06-20 14:21:34 +08:00 |
|
cabbage
|
a7667a249a
|
## 项目nacos配置；
|
2025-06-20 10:22:51 +08:00 |
|
cabbage
|
85fb8a787c
|
## 初始化项目；
|
2025-06-20 10:18:26 +08:00 |
|
cabbage
|
3b408c163b
|
## 会员列表返回分红奖衔；当月奖衔分析搜索条件报错处理；
|
2025-06-19 16:09:23 +08:00 |
|
cabbage
|
7b5e4e264e
|
## get-info返回分红奖衔；
|
2025-06-19 16:09:23 +08:00 |
|
cabbage
|
bacedcfd33
|
## 秒结、日结恢复分红奖衔；
|
2025-06-19 16:09:22 +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
|
6647920be4
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into test
|
2025-06-19 13:39:56 +08:00 |
|
sangelxiu1
|
f7f995c9c3
|
## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝
|
2025-06-19 13:38:58 +08:00 |
|
sangelxiu1
|
953b682f52
|
Merge remote-tracking branch 'refs/remotes/origin/dev' into test
|
2025-06-18 16:59:56 +08:00 |
|
cabbage
|
164a336558
|
## 替换国际化处理；
|
2025-06-18 16:46:04 +08:00 |
|
cabbage
|
4da0791b78
|
## 等级枚举不走国际化；
|
2025-06-18 16:36:53 +08:00 |
|
cabbage
|
dfc21bc3bd
|
## 等级枚举不走国际化；
|
2025-06-18 16:35:12 +08:00 |
|
cabbage
|
1f0f2aedc5
|
## 指定新零售在线支付测试账号；
|
2025-06-18 15:56:48 +08:00 |
|
cabbage
|
bdc00adc9e
|
## 指定新零售在线支付测试账号；
|
2025-06-18 15:27:06 +08:00 |
|
cabbage
|
6a0e9c7463
|
## 调整部门获取下个编号方法；
|
2025-06-18 11:23:39 +08:00 |
|
sangelxiu1
|
236296dbc4
|
## Fix - 自动登录,获取systemType异常
|
2025-06-18 11:23:38 +08:00 |
|
cabbage
|
c2c50a8408
|
## 免密登录不校验用户支付状态；去掉7位用户编号单独登录方法；
|
2025-06-18 11:23:38 +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 |