 zhangheng
|
1393e24989
|
## 分页返回值修改
|
2025-09-26 15:50:51 +08:00 |
|
zhangheng
|
af5dbcc788
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 15:50:20 +08:00 |
 cabbage
|
1fea92b74b
|
## 赠点如果直推下没有可以填充的，则按血缘上逻辑走；
|
2025-09-26 15:20:18 +08:00 |
|
cabbage
|
a41cd10d4d
|
## 赠点激活阶段填充处理；
|
2025-09-26 14:56:13 +08:00 |
|
zhangheng
|
6f6dcae8b8
|
## 会员点位信息为空
|
2025-09-26 14:09:32 +08:00 |
|
zhangheng
|
8e9d632d38
|
## 会员子点位会员编号非必传
|
2025-09-26 13:47:42 +08:00 |
|
zhangheng
|
12d91a47be
|
## 会员子点位信息添加导出
|
2025-09-26 13:47:40 +08:00 |
|
zhangheng
|
6c6696ee85
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 13:47:37 +08:00 |
|
zhangheng
|
8ee826e7f4
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 13:47:33 +08:00 |
|
zhangheng
|
478013dd99
|
## 三阶段架构列表数据
|
2025-09-26 13:47:25 +08:00 |
|
zhangheng
|
3066c799c5
|
## 三阶段架构会员名称添加点位信息
|
2025-09-26 13:47:17 +08:00 |
|
zhangheng
|
86f7b8c033
|
## 三阶段架构会员名称添加点位信息(根节点添加子节点信息)
|
2025-09-26 13:46:35 +08:00 |
|
zhangheng
|
021d43282d
|
## 三阶段架构会员名称添加点位信息
|
2025-09-26 13:46:32 +08:00 |
 sangelxiu1
|
aea3f9fe9b
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-26 09:06:57 +08:00 |
|
sangelxiu1
|
7568951e5a
|
## Opt - 小购物车非空验证
|
2025-09-26 09:06:50 +08:00 |
|
cabbage
|
02ff3cd355
|
## 二三阶段数据补全；
|
2025-09-25 18:08:07 +08:00 |
|
zhangheng
|
5504309c8a
|
## 三阶段架构列表数据
|
2025-09-25 18:08:05 +08:00 |
|
cabbage
|
34903b0b00
|
## 三阶段奖金发放点位数处理；
|
2025-09-25 18:08:02 +08:00 |
|
sangelxiu1
|
7ebe459dd9
|
## Opt - 甄选专区限购单笔限购20000
|
2025-09-25 15:12:40 +08:00 |
|
sangelxiu1
|
9a563f0c09
|
## Opt - 奖金来源
|
2025-09-25 14:59:29 +08:00 |
|
cabbage
|
e6f247670e
|
## 三阶段奖金处理；
|
2025-09-25 14:06:03 +08:00 |
|
cabbage
|
97a5e59239
|
## 三阶段奖金生成；
|
2025-09-25 14:06:01 +08:00 |
|
cabbage
|
413db854cb
|
## 三阶段奖金生成；
|
2025-09-25 14:05:59 +08:00 |
|
zhangheng
|
5fac72f129
|
## 三阶段架构会员名称添加点位信息(根节点添加子节点信息)
|
2025-09-25 14:05:58 +08:00 |
|
sangelxiu1
|
a6532f8a8f
|
## Opt - 奖金汇总
|
2025-09-25 14:05:56 +08:00 |
|
zhangheng
|
9cd46910cb
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-25 11:14:08 +08:00 |
|
zhangheng
|
8a73e57cc7
|
## 三阶段架构会员名称添加点位信息
|
2025-09-25 11:14:01 +08:00 |
|
sangelxiu1
|
6325679655
|
## Opt - 奖金来源调整来源ID的逻辑&奖金明细
|
2025-09-25 10:34:43 +08:00 |
|
cabbage
|
91fac644d3
|
## 阶段收益添加来源会员；
|
2025-09-25 09:48:58 +08:00 |
|
cabbage
|
f50645d5ab
|
## 兼容三阶段部分点位为空以及收益处理订单为空；
|
2025-09-25 09:48:58 +08:00 |
|
cabbage
|
637aca701d
|
## 每日点位总数处理；添加三阶段奖金发放记录字段；
|
2025-09-24 19:06:23 +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 |