 sangelxiu1
|
7f031633f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-10 20:34:00 +08:00 |
|
sangelxiu1
|
db5cf31ffc
|
## Opt - 非空验证.
|
2025-06-10 20:33:54 +08:00 |
 cabbage
|
424e0bd18c
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# bd-api/bd-api-sale/src/main/java/com/hzs/sale/order/ISaOrderServiceApi.java
# bd-api/bd-api-system/src/main/java/com/hzs/system/config/IBonusItemsServiceApi.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/mapper/CuMemberRetailRangeMapper.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailRangeServiceImpl.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/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/resources/mapper/bonus/achieve/CuMemberAchieveMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberRetailRangeMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/achieve/CuMemberTreeMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/detail/CuMemberAwardsMapper.xml
# bd-business/bd-business-bonus/src/main/resources/mapper/bonus/order/BonusOrderMapper.xml
# bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/provider/SaOrderServiceProvider.java
# bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EAwardsType.java
|
2025-06-10 20:32:18 +08:00 |
|
cabbage
|
7e20c1d0ed
|
## 秒结和日结中盒数、业绩上传处理；等级、奖衔计算处理；
|
2025-06-10 20:31:14 +08:00 |
|
cabbage
|
07d9dcc558
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-10 17:58:30 +08:00 |
|
cabbage
|
ee155ff59b
|
## 注册升级购买指定商品，则会员为激活；
|
2025-06-10 17:58:23 +08:00 |
|
sangelxiu1
|
b0cc64ade4
|
## Opt - 户籍变更->万能验证码
|
2025-06-10 17:50:50 +08:00 |
|
sangelxiu1
|
46488c8128
|
## Opt - 删除获取订单状态接口
|
2025-06-10 17:14:06 +08:00 |
|
cabbage
|
fdbe598eb4
|
## 秒结等级、奖衔处理，业绩、盒数上传处理；部分枚举替换；
|
2025-06-10 15:45:29 +08:00 |
|
cabbage
|
17106259ff
|
## 升级订单处理等级返回调整；
|
2025-06-10 15:45:28 +08:00 |
|
cabbage
|
933056496c
|
## 升级订单撤单处理逻辑调整；
|
2025-06-10 15:45:28 +08:00 |
|
cabbage
|
d69566eeef
|
## 秒结等级、奖衔处理，业绩、盒数上传处理；部分枚举替换；
|
2025-06-10 15:45:02 +08:00 |
|
cabbage
|
8d0ed5cc76
|
## 升级订单处理等级返回调整；
|
2025-06-10 15:06:37 +08:00 |
|
cabbage
|
2d14f67f21
|
## 升级订单撤单处理逻辑调整；
|
2025-06-10 14:57:29 +08:00 |
|
cabbage
|
16c88f4c15
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-06-10 11:00:25 +08:00 |
|
cabbage
|
cfcfa585e5
|
## 恢复升级专区处理；
|
2025-06-09 20:38:32 +08:00 |
|
cabbage
|
cf532f5980
|
## 校验会员等级返回异常处理调整；
|
2025-06-09 20:29:54 +08:00 |
|
cabbage
|
eb0e6e54b8
|
## 调整查询方式；
|
2025-06-09 17:35:00 +08:00 |
|
sangelxiu1
|
42ede2b927
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-09 16:58:44 +08:00 |
|
cabbage
|
bbc299e50a
|
## 调整代码逻辑；
|
2025-06-09 16:55:32 +08:00 |
|
cabbage
|
f9c50f26c3
|
## 升级、复购恢复撤单逻辑；商品列表返回字段调整；
|
2025-06-09 16:37:08 +08:00 |
|
cabbage
|
8ddb794ada
|
## 复购、重消订单下单处理；
|
2025-06-09 15:48:48 +08:00 |
|
cabbage
|
e635528d63
|
## 注册相关接口修改完善；
|
2025-06-09 15:12:43 +08:00 |
|
sangelxiu1
|
57b854e56d
|
## Opt - 参考北大-未配置业务手续费情况下默认给0
|
2025-06-09 15:09:43 +08:00 |
|
sangelxiu1
|
1d884bf9bc
|
## Opt - 删除isMakerSpace属性映射
|
2025-06-09 14:33:55 +08:00 |
|
sangelxiu1
|
7879490f8a
|
## Opt - 取消验证身份证有效期
|
2025-06-09 14:14:44 +08:00 |
|
cabbage
|
66a246bab9
|
## get-info返回国家；
|
2025-06-09 14:07:56 +08:00 |
|
cabbage
|
cbd8c4319f
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-06-09 13:35:30 +08:00 |
|
cabbage
|
d96583d316
|
## 调整get-info接口；判断选择区域条件改为血缘累计业绩30万；
|
2025-06-09 13:35:10 +08:00 |
|
cabbage
|
153a3fd24b
|
## 因手机号可以重复，登录时只能使用账号进行登录；
|
2025-06-09 13:35:10 +08:00 |
|
cabbage
|
34e86d1835
|
## 调整部分三方定时任务注释；
|
2025-06-09 13:35:09 +08:00 |
|
cabbage
|
c8d446ad8b
|
## 调整部分三方注释；
|
2025-06-09 13:35:07 +08:00 |
woody
|
bb335d88a3
|
feat(msg): 国际化文案替换
|
2025-06-09 11:13:54 +08:00 |
|
woody
|
b9e01e1890
|
feat(msg): 国际化文案替换
|
2025-06-09 10:58:08 +08:00 |
|
cabbage
|
8adde9fc1d
|
## 调整get-info接口；判断选择区域条件改为血缘累计业绩30万；
|
2025-06-09 10:46:08 +08:00 |
|
sangelxiu1
|
5fc0054d75
|
## Opt - 取消手机号唯一验证
|
2025-06-09 10:37:55 +08:00 |
|
cabbage
|
45a4599ccc
|
## 因手机号可以重复，登录时只能使用账号进行登录；
|
2025-06-09 10:37:44 +08:00 |
|
cabbage
|
309d12a97c
|
## 调整部分三方定时任务注释；
|
2025-06-09 10:37:05 +08:00 |
|
cabbage
|
c5d6042246
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-09 09:53:33 +08:00 |
|
cabbage
|
691766da64
|
## 调整部分三方注释；
|
2025-06-09 09:53:29 +08:00 |
|
cabbage
|
07ff5cd199
|
## 调整nacos配置；
|
2025-06-09 09:20:24 +08:00 |
|
cabbage
|
5266042663
|
## 调整nacos配置；
|
2025-06-09 09:20:08 +08:00 |
|
cabbage
|
b072c8d054
|
## 定时任务配置；
|
2025-06-09 09:15:30 +08:00 |
|
cabbage
|
a7a51a1ba9
|
## 定时任务配置；
|
2025-06-09 09:14:47 +08:00 |
|
cabbage
|
bf08c889e6
|
## 仓储发库同步功能；
|
2025-06-08 16:29:05 +08:00 |
|
cabbage
|
07ffadeab0
|
## 调整部分代码逻辑；
|
2025-06-08 16:05:57 +08:00 |
|
cabbage
|
a6e5e94a44
|
## 测试推送；
|
2025-06-06 17:19:44 +08:00 |
|
cabbage
|
249791b884
|
## 去掉不需要内容；
|
2025-06-06 17:07:36 +08:00 |
|
cabbage
|
ae5df106d7
|
## 初始化去掉部分不需要接口；
|
2025-06-06 16:58:45 +08:00 |
|
cabbage
|
6095ec5e0e
|
## 初始化去掉部分不需要接口；
|
2025-06-06 16:50:22 +08:00 |