 sangelxiu1
|
6116ad468c
|
## Feat - 新零售-支付
|
2025-07-09 11:02:15 +08:00 |
|
sangelxiu1
|
613c8a8002
|
## Feat - 新零售-支付
|
2025-07-09 10:59:32 +08:00 |
|
sangelxiu1
|
2044185ae3
|
## Feat - 支付依赖
|
2025-07-09 10:58:36 +08:00 |
 cabbage
|
2417962cd0
|
Merge remote-tracking branch 'origin/test' into online
# Conflicts:
# 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/vo/MemberBonusFirstPurchaseVO.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/detail/service/impl/CuRegionAssessServiceImpl.java
# 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-member/src/main/java/com/hzs/retail/member/controller/api/RetailMemberController.java
# bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailAchieveVO.java
# bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailRegionMapper.xml
# bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
# bd-third/src/main/java/com/hzs/third/job/controller/JobTestController.java
|
2025-07-09 09:20:11 +08:00 |
|
sangelxiu1
|
8bea3e39b6
|
## Opt - 区域体系增加查询条件
|
2025-07-09 09:18:03 +08:00 |
|
cabbage
|
4ff23dadbd
|
## 奖衔配置调整；去掉4-N配置等；
|
2025-07-09 09:18:00 +08:00 |
|
sangelxiu1
|
82f0ab78a0
|
## Feat - 盒数调整为小数
|
2025-07-09 09:17:54 +08:00 |
|
sangelxiu1
|
d19e7b15aa
|
## Feat - 选择区域增加小区10W验证&按体系分组绑定区域
|
2025-07-09 09:17:50 +08:00 |
|
sangelxiu1
|
ae3b75ae33
|
## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
|
2025-07-09 09:17:46 +08:00 |
|
sangelxiu1
|
a0f69be043
|
## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
|
2025-07-09 09:17:40 +08:00 |
|
sangelxiu1
|
88c0c939fd
|
## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
|
2025-07-09 09:16:17 +08:00 |
woody
|
9ccd411aa6
|
feat(BdRegionVertexServiceImpl): 添加区域分组判断逻辑修复
|
2025-07-09 09:16:12 +08:00 |
|
sangelxiu1
|
eaa6c9d117
|
## Opt - 补充继承基类的sql
|
2025-07-09 09:16:10 +08:00 |
|
sangelxiu1
|
4b9db13ef4
|
## Feat - 添加&修改体系,增加分组ID
|
2025-07-09 09:15:29 +08:00 |
|
sangelxiu1
|
93498d45af
|
## Feat - 增加获取全部区域体系分组配置列表&体系列表增加绑定区域名称
|
2025-07-09 09:15:25 +08:00 |
|
sangelxiu1
|
d21e31a84f
|
## Feat - 区域体系分组配置
|
2025-07-09 09:15:21 +08:00 |
|
cabbage
|
1b4e8b9d1b
|
## 会员升级奖衔处理优化；
|
2025-07-07 15:46:36 +08:00 |
|
cabbage
|
262066c6df
|
## 添加日志；调整订单类型判断位置；
|
2025-07-07 15:46:36 +08:00 |
|
cabbage
|
d9e9589d70
|
## 会员升级奖衔处理优化；
|
2025-07-07 15:44:54 +08:00 |
|
cabbage
|
dec97f793e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-07 10:43:11 +08:00 |
|
cabbage
|
75380f03d7
|
## 添加日志；调整订单类型判断位置；
|
2025-07-07 10:43:06 +08:00 |
|
sangelxiu1
|
fcee5cb16e
|
## Opt - 空值验证
|
2025-07-05 10:18:28 +08:00 |
|
sangelxiu1
|
23db6a8918
|
## Opt - 空值验证
|
2025-07-05 10:18:03 +08:00 |
|
sangelxiu1
|
cdcb13f9a1
|
Merge remote-tracking branch 'origin/test' into test
|
2025-07-05 09:57:05 +08:00 |
|
sangelxiu1
|
48a5ee0440
|
## Opt - 空值验证
|
2025-07-05 09:56:53 +08:00 |
|
sangelxiu1
|
0ef00695f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-05 09:56:32 +08:00 |
|
sangelxiu1
|
4bef2feacd
|
## Opt - 空值验证
|
2025-07-05 09:56:26 +08:00 |
|
cabbage
|
757a574191
|
## 秒结兼容多送2级处理问题；
|
2025-07-04 18:29:31 +08:00 |
|
cabbage
|
8eb6ee8586
|
## 秒结兼容多送2级处理问题；
|
2025-07-04 18:29:00 +08:00 |
|
cabbage
|
3eae83f56b
|
## 新零售京东支付配置；
|
2025-07-04 15:26:43 +08:00 |
|
cabbage
|
96d7e1d213
|
## 分红奖衔处理调整；
|
2025-07-04 14:53:40 +08:00 |
|
cabbage
|
f2f9e0ac22
|
## 分红奖衔处理调整；
|
2025-07-04 14:53:10 +08:00 |
|
cabbage
|
6f928a4dbd
|
## 撤单秒结盒数、业绩应该扣减；
|
2025-07-04 11:16:15 +08:00 |
|
cabbage
|
f9c40d43c1
|
## 添加新零售计算盒数商品；
|
2025-07-04 11:16:15 +08:00 |
|
cabbage
|
53ad5fc0bd
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 11:15:50 +08:00 |
|
cabbage
|
52fa865a08
|
## 撤单秒结盒数、业绩应该扣减；
|
2025-07-04 11:15:46 +08:00 |
|
sangelxiu1
|
936e404e70
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 11:11:50 +08:00 |
|
sangelxiu1
|
c3eee5905f
|
## Feat - 京东配置文件
|
2025-07-04 11:11:45 +08:00 |
|
cabbage
|
dabf858e2b
|
## 添加新零售计算盒数商品；
|
2025-07-04 11:03:14 +08:00 |
|
cabbage
|
002c178c83
|
## 撤单回退盒数业绩处理（227）；盒数累计改为直接取订单盒数不再重新计算；
|
2025-07-04 10:10:16 +08:00 |
|
cabbage
|
49628d3755
|
## 重消订单上传业绩处理（226）；
|
2025-07-04 10:10:16 +08:00 |
|
cabbage
|
4647412b32
|
## 撤单回退盒数业绩处理（227）；盒数累计改为直接取订单盒数不再重新计算；
|
2025-07-04 09:52:51 +08:00 |
|
sangelxiu1
|
e86e8a05d7
|
## Opt - 盒数&业绩(ALL_)
|
2025-07-04 09:33:00 +08:00 |
|
sangelxiu1
|
fda785c68c
|
## Opt - 选择区域业绩取值替换(ALL_)
|
2025-07-04 09:33:00 +08:00 |
|
sangelxiu1
|
fbd6a2e033
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 09:32:25 +08:00 |
|
sangelxiu1
|
dd7c121577
|
## Opt - 盒数&业绩(ALL_)
|
2025-07-04 09:32:21 +08:00 |
|
cabbage
|
c7cb018ca1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 09:27:38 +08:00 |
|
cabbage
|
45cca20ff6
|
## 重消订单上传业绩处理（226）；
|
2025-07-04 09:27:22 +08:00 |
|
sangelxiu1
|
c274fba09e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 09:26:16 +08:00 |
|
sangelxiu1
|
6b4256bf1e
|
## Opt - 选择区域业绩取值替换(ALL_)
|
2025-07-04 09:26:10 +08:00 |