 cabbage
|
f50645d5ab
|
## 兼容三阶段部分点位为空以及收益处理订单为空；
|
2025-09-25 09:48:58 +08:00 |
|
cabbage
|
5d19bb24c5
|
## 阶段收益添加来源会员；
|
2025-09-25 09:48:40 +08:00 |
|
cabbage
|
9495d34a62
|
## 兼容三阶段部分点位为空以及收益处理订单为空；
|
2025-09-25 09:43:56 +08:00 |
|
cabbage
|
637aca701d
|
## 每日点位总数处理；添加三阶段奖金发放记录字段；
|
2025-09-24 19:06:23 +08:00 |
|
cabbage
|
7a63b310ba
|
## 每日点位总数处理；添加三阶段奖金发放记录字段；
|
2025-09-24 19:05:58 +08:00 |
|
cabbage
|
05f57a36ca
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/ICuMemberRetailDetailService.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/achieve/service/impl/CuMemberRetailDetailServiceImpl.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/bonus/dto/BonusStageData.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/mapper/CuMemberBonusStageMapper.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/CuMemberBonusServiceImpl.java
# bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/CuMemberBonusStageServiceImpl.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-bonus/src/main/resources/mapper/bonus/bonus/CuMemberBonusStageMapper.xml
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
# bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/BonusMsgConstants.java
# bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/achieve/CuMemberRetailRange.java
# bd-third/src/main/java/com/hzs/third/pay/service/impl/TOnlinePaymentServiceImpl.java
# bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml
|
2025-09-24 18:04:19 +08:00 |
|
cabbage
|
86b7208d3d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-24 18:00:41 +08:00 |
|
cabbage
|
bacbb61168
|
## 一二三阶段填充点位数据；一二阶段奖金计算；
|
2025-09-24 18:00:36 +08:00 |
 sangelxiu1
|
edb598878e
|
## Opt - 奖金来源 增加阶段收益部分
|
2025-09-24 17:55:12 +08:00 |
|
sangelxiu1
|
08f6b98e29
|
## Opt - 替换枚举&非空校验
|
2025-09-24 17:51:39 +08:00 |
|
sangelxiu1
|
2e46aca4e1
|
## Opt - 京东支付 页面返回地址(兼容性)
|
2025-09-24 15:52:38 +08:00 |
|
sangelxiu1
|
7fd4beb6e6
|
## Opt - 京东支付 页面返回地址(兼容性)
|
2025-09-24 15:46:30 +08:00 |
 zhangheng
|
639c76366d
|
## 三阶段架构前台报错信息修改
|
2025-09-24 14:42:36 +08:00 |
|
zhangheng
|
9b6ec03b73
|
## 推荐架构逻辑修改:查询传入日结信息(当天查询上一天日结信息)
|
2025-09-24 13:37:55 +08:00 |
|
zhangheng
|
bc3cd3d941
|
## 三阶段架构前台查询报错提示语修改
|
2025-09-24 13:37:53 +08:00 |
|
zhangheng
|
fd85b3f972
|
## 三阶段架构前台查询报错提示语修改
|
2025-09-24 13:37:50 +08:00 |
|
zhangheng
|
cef1492180
|
## 推荐架构逻辑修改:查询传入日结信息(当天查询上一天日结信息)
|
2025-09-24 13:36:12 +08:00 |
|
zhangheng
|
cff02f12da
|
## 三阶段架构前台查询报错提示语修改
|
2025-09-24 09:58:18 +08:00 |
|
zhangheng
|
1568b3c197
|
## 三阶段架构前台查询报错提示语修改
|
2025-09-24 09:54:36 +08:00 |
|
zhangheng
|
fb0e1c62e8
|
## 三阶段架构子节点查询前台
|
2025-09-23 15:57:13 +08:00 |
|
zhangheng
|
5b539aad41
|
## 三阶段架构前台
|
2025-09-23 15:57:10 +08:00 |
|
zhangheng
|
56a63dff4c
|
## 三阶段架构子节点查询前台
|
2025-09-23 15:48:30 +08:00 |
|
zhangheng
|
b4cbcda88b
|
## 三阶段架构前台
|
2025-09-23 15:08:24 +08:00 |
|
cabbage
|
6a4429ca68
|
## 日结结束调用业绩汇总；
|
2025-09-23 12:00:25 +08:00 |
|
sangelxiu1
|
07f8dbe8d3
|
## Feat - 业绩统计
|
2025-09-23 11:54:03 +08:00 |
|
sangelxiu1
|
a2172da9ed
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-23 11:36:09 +08:00 |
|
sangelxiu1
|
bfb04378b1
|
## Opt - 后台撤单 (商城-43) 处理
|
2025-09-23 11:35:50 +08:00 |
|
zhangheng
|
bf6acc5dd7
|
## 会员日结信息非空校验
|
2025-09-23 11:20:56 +08:00 |
|
zhangheng
|
d344eb098b
|
## 删除不必要数据
|
2025-09-23 11:20:50 +08:00 |
|
zhangheng
|
de291e986a
|
## 三阶段架构使用枚举,修改节点名称
|
2025-09-23 11:20:45 +08:00 |
|
sangelxiu1
|
336db5dd2a
|
## Opt - 区分精品专区/商城专区
|
2025-09-23 11:20:08 +08:00 |
|
zhangheng
|
ff594b0264
|
## 会员日结信息非空校验
|
2025-09-23 11:05:12 +08:00 |
|
zhangheng
|
e81d233aef
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-23 10:25:39 +08:00 |
|
zhangheng
|
9ca1e812e5
|
## 删除不必要数据
|
2025-09-23 10:25:26 +08:00 |
|
sangelxiu1
|
7ed89abcc0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-23 10:25:02 +08:00 |
|
sangelxiu1
|
7dda569640
|
## Opt - 在线支付明细
|
2025-09-23 10:24:56 +08:00 |
|
zhangheng
|
a22ae8289d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-23 10:08:24 +08:00 |
|
zhangheng
|
12d1e8f0f8
|
## 三阶段架构使用枚举,修改节点名称
|
2025-09-23 10:08:15 +08:00 |
|
sangelxiu1
|
b925f2c074
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-23 09:49:25 +08:00 |
|
sangelxiu1
|
26c5325bcb
|
## Opt - 区分精品专区/商城专区
|
2025-09-23 09:49:16 +08:00 |
|
cabbage
|
8642d1aca3
|
## 一阶段结算入库；
|
2025-09-22 19:25:48 +08:00 |
|
zhangheng
|
521de1ed7b
|
## 校验当前日结表是否存在添加非空校验
|
2025-09-22 19:25:47 +08:00 |
|
sangelxiu1
|
f59c0ec32a
|
## Fix - OrderServiceApi
|
2025-09-22 19:25:47 +08:00 |
|
sangelxiu1
|
d2fd2c87c8
|
## Opt - 撤单删除会员账号验证
|
2025-09-22 19:25:47 +08:00 |
|
sangelxiu1
|
817bca7553
|
## Opt - 秒结MQ(下单/撤单)
|
2025-09-22 19:25:46 +08:00 |
|
zhangheng
|
8ccf1f4c9a
|
## 三阶段架构,子会员节点查询阶段状态可为空
|
2025-09-22 19:25:39 +08:00 |
|
cabbage
|
9868e5fabb
|
## 日结明细唯一索引调整；
|
2025-09-22 19:25:35 +08:00 |
|
cabbage
|
7a5bc55ddf
|
## 一阶段结算入库；
|
2025-09-22 19:24:00 +08:00 |
|
zhangheng
|
444c2be451
|
## 校验当前日结表是否存在添加非空校验
|
2025-09-22 18:00:30 +08:00 |
|
sangelxiu1
|
8645211377
|
## Fix - OrderServiceApi
|
2025-09-22 17:51:33 +08:00 |