zhangheng
|
c2cad9d48e
|
## 会员点位信息为空
|
2025-09-26 14:09:08 +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 |
zhangheng
|
8bc857429d
|
## 会员子点位会员编号非必传
|
2025-09-26 13:42:46 +08:00 |
zhangheng
|
6d94163770
|
## 会员子点位信息添加导出
|
2025-09-26 11:43:27 +08:00 |
zhangheng
|
d367046cfd
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 10:42:55 +08:00 |
zhangheng
|
18e62e2d6b
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 09:39:54 +08:00 |
sangelxiu1
|
6a14870803
|
## Opt - 小购物车非空验证
|
2025-09-26 09:07:15 +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 |
cabbage
|
633db7b773
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-25 18:07:41 +08:00 |
cabbage
|
737f118daf
|
## 二三阶段数据补全;
|
2025-09-25 18:07:36 +08:00 |
zhangheng
|
12b98ee6a0
|
## 三阶段架构列表数据
|
2025-09-25 15:44:07 +08:00 |
sangelxiu1
|
7ebe459dd9
|
## Opt - 甄选专区限购单笔限购20000
|
2025-09-25 15:12:40 +08:00 |
sangelxiu1
|
2d051ef4f5
|
## Opt - 甄选专区限购单笔限购20000
|
2025-09-25 15:12:16 +08:00 |
sangelxiu1
|
9a563f0c09
|
## Opt - 奖金来源
|
2025-09-25 14:59:29 +08:00 |
sangelxiu1
|
ce8a8fd222
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-25 14:59:09 +08:00 |
sangelxiu1
|
cf3c6a8a9c
|
## Opt - 奖金来源
|
2025-09-25 14:59:02 +08:00 |
cabbage
|
2d85c510a3
|
## 三阶段奖金发放点位数处理;
|
2025-09-25 14:31:03 +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 |
cabbage
|
061c951d6a
|
## 三阶段奖金处理;
|
2025-09-25 14:04:34 +08:00 |
cabbage
|
b18b984b5a
|
## 三阶段奖金生成;
|
2025-09-25 13:35:21 +08:00 |
cabbage
|
93926f6932
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-25 11:31:11 +08:00 |
cabbage
|
90ed8f5c7c
|
## 三阶段奖金生成;
|
2025-09-25 11:31:07 +08:00 |
zhangheng
|
2735fc9ca1
|
## 三阶段架构会员名称添加点位信息(根节点添加子节点信息)
|
2025-09-25 11:26:08 +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 |
zhangheng
|
d2a4c012c7
|
## 三阶段架构会员名称添加点位信息
|
2025-09-25 11:13:28 +08:00 |
sangelxiu1
|
90512bb1e0
|
## Opt - 奖金汇总
|
2025-09-25 10:51:17 +08:00 |
sangelxiu1
|
4030dbe39a
|
## Opt - 奖金来源调整来源ID的逻辑&奖金明细
|
2025-09-25 10:35:03 +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
|
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 |
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
|
9ca1e812e5
|
## 删除不必要数据
|
2025-09-23 10:25:26 +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 |
sangelxiu1
|
330d7acfbb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-22 16:53:22 +08:00 |
sangelxiu1
|
b57f668b50
|
## Opt - 撤单删除会员账号验证
|
2025-09-22 16:53:16 +08:00 |
zhangheng
|
6860d3359b
|
## 三阶段架构,子会员节点查询阶段状态可为空
|
2025-09-22 16:38:44 +08:00 |
cabbage
|
460a6e1d02
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-22 16:35:48 +08:00 |
cabbage
|
ae08bd578c
|
## 日结明细唯一索引调整;
|
2025-09-22 16:35:44 +08:00 |
sangelxiu1
|
b87a934971
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-22 16:26:22 +08:00 |
sangelxiu1
|
800d9db8fa
|
## Opt - 秒结MQ(下单/撤单)
|
2025-09-22 16:26:15 +08:00 |
cabbage
|
48863d8dc7
|
## 一阶段填充点位逻辑调整;
|
2025-09-22 15:49:41 +08:00 |
zhangheng
|
c91ce61eac
|
## 三阶段架构,子会员节点查询
|
2025-09-22 15:49:41 +08:00 |
cabbage
|
a518eb8775
|
## 阶段收益入库操作;封装阶段收益使用备注等;
|
2025-09-22 15:49:41 +08:00 |
cabbage
|
08bc71c55f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-22 15:49:21 +08:00 |
cabbage
|
abe46ad69e
|
## 一阶段填充点位逻辑调整;
|
2025-09-22 15:49:15 +08:00 |
zhangheng
|
619e6f1006
|
## 三阶段架构,子会员节点查询
|
2025-09-22 15:13:12 +08:00 |
sangelxiu1
|
10c98b6d99
|
## Opt - 订单完成后推送MQ
|
2025-09-22 09:08:06 +08:00 |
cabbage
|
e3fae413a6
|
## 阶段收益入库操作;封装阶段收益使用备注等;
|
2025-09-21 10:47:40 +08:00 |
cabbage
|
30572dc242
|
## 结算表初始化新字段;日数据如果为空不执行插入;
|
2025-09-21 09:52:15 +08:00 |
cabbage
|
656f6278eb
|
## 结算表初始化新字段;日数据如果为空不执行插入;
|
2025-09-21 09:51:08 +08:00 |
cabbage
|
3b89fd6ca1
|
## 一阶段点位填充处理;
|
2025-09-19 18:15:36 +08:00 |
cabbage
|
647be8bb87
|
## 前缀更新为ZK;日结、日结明细表初始化;
|
2025-09-19 18:15:34 +08:00 |
sangelxiu1
|
d34b279ce0
|
## Opt - 反射按顺序规则填充CuMemberRetailDetail
|
2025-09-19 18:15:32 +08:00 |
cabbage
|
f88ccb7cb8
|
## 阶段奖金计算处理(未完成);
|
2025-09-19 18:15:31 +08:00 |
zhangheng
|
56f9170d4c
|
## 推荐列表添加注册业绩、团队人数
|
2025-09-19 18:15:29 +08:00 |
cabbage
|
bcc4cfed88
|
## 一阶段点位填充处理;
|
2025-09-19 18:14:50 +08:00 |
sangelxiu1
|
b2ace16723
|
## Fix - Redis临时订单key
|
2025-09-19 16:00:38 +08:00 |
sangelxiu1
|
93ea114c23
|
## Fix - Redis临时订单key
|
2025-09-19 16:00:19 +08:00 |
sangelxiu1
|
f70d81fc90
|
## Fix - 【H5】扫码注册,选商城专区的品下单后支付完成,提示截图中的提示信息[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=395]
|
2025-09-19 15:42:00 +08:00 |
sangelxiu1
|
f2c05f15b1
|
## Opt - 增加甄选专区 商品同精品专区一致,下单逻辑同商城专区一致
|
2025-09-19 15:41:59 +08:00 |
sangelxiu1
|
1788428d67
|
## Fix - 【H5】扫码注册,选商城专区的品下单后支付完成,提示截图中的提示信息[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=395]
|
2025-09-19 15:41:41 +08:00 |
sangelxiu1
|
6926f95e2c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-19 14:52:59 +08:00 |
sangelxiu1
|
8187299ebf
|
## Opt - 增加甄选专区 商品同精品专区一致,下单逻辑同商城专区一致
|
2025-09-19 14:52:52 +08:00 |
cabbage
|
2fb7a7aa43
|
## 前缀更新为ZK;日结、日结明细表初始化;
|
2025-09-19 10:50:34 +08:00 |
sangelxiu1
|
0370e52cc3
|
## Fix - 【H5】扫码注册和注册专区注册,没有限制一个手机号的注册次数,也没有限制手机号一样姓名不一样的情况 [http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=388]
|
2025-09-19 09:15:45 +08:00 |
sangelxiu1
|
443f7c14ac
|
## Opt - 精品专区单订单金额上限
|
2025-09-19 09:15:45 +08:00 |
sangelxiu1
|
769164a79a
|
## Fix - 【H5】扫码注册和注册专区注册,没有限制一个手机号的注册次数,也没有限制手机号一样姓名不一样的情况 [http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=388]
|
2025-09-19 08:48:39 +08:00 |
sangelxiu1
|
f45a4f3e23
|
## Opt - 反射按顺序规则填充CuMemberRetailDetail
|
2025-09-18 17:25:42 +08:00 |
cabbage
|
c37e19f473
|
## 阶段奖金计算处理(未完成);
|
2025-09-18 16:56:54 +08:00 |
sangelxiu1
|
b58445962e
|
## Opt - 精品专区单订单金额上限
|
2025-09-18 16:01:00 +08:00 |
zhangheng
|
a2d976e10a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-18 15:07:37 +08:00 |
zhangheng
|
2a08a20497
|
## 推荐列表添加注册业绩、团队人数
|
2025-09-18 15:07:24 +08:00 |
cabbage
|
e70a9e0179
|
## 精品专区直推收益;商城专区见点收益;商品基础规格等配置去掉缓存;去掉部分不需要代码和枚举;
|
2025-09-18 14:19:08 +08:00 |
cabbage
|
900129db57
|
## 精品专区直推收益;商城专区见点收益;商品基础规格等配置去掉缓存;去掉部分不需要代码和枚举;
|
2025-09-18 14:18:20 +08:00 |
sangelxiu1
|
3bf75a5fb6
|
## Opt - 注册奖衔
|
2025-09-18 11:30:57 +08:00 |
sangelxiu1
|
d4e4a42bd1
|
## Opt - 注册奖衔
|
2025-09-18 11:30:32 +08:00 |
sangelxiu1
|
e66054c526
|
## Opt - 迁移分享注册流程-适配商城专区邮费&多商品数量
|
2025-09-18 09:05:47 +08:00 |
sangelxiu1
|
1a4357ba26
|
## Opt - 迁移分享注册流程-适配商城专区邮费&多商品数量
|
2025-09-18 09:02:44 +08:00 |
cabbage
|
6267b5fb07
|
## 每天创建结算明细表;
|
2025-09-17 13:52:05 +08:00 |
cabbage
|
1174b87575
|
## 提现走绑定银行卡逻辑;银行卡添加4要素认证;
|
2025-09-17 13:52:05 +08:00 |
cabbage
|
01beed1b10
|
## 迁移补全功能;
|
2025-09-17 13:52:04 +08:00 |
cabbage
|
111bd8cf49
|
## 转账、提现添加账户金额是否足够校验;
|
2025-09-17 13:52:02 +08:00 |
sangelxiu1
|
464868338f
|
## Opt - 迁移分享注册流程
|
2025-09-17 13:52:00 +08:00 |
cabbage
|
97205a139d
|
## 去掉原复购级差;添加会员日结明细;
|
2025-09-17 13:51:58 +08:00 |
zhangheng
|
6278a2429e
|
## 调换货物和业绩汇总导出最新代码
|
2025-09-17 13:51:56 +08:00 |
cabbage
|
158c5e8a9b
|
## 每天创建结算明细表;
|
2025-09-17 13:49:51 +08:00 |
cabbage
|
d71c8ef105
|
## 提现走绑定银行卡逻辑;银行卡添加4要素认证;
|
2025-09-17 12:00:09 +08:00 |
cabbage
|
903d21f4b7
|
## 迁移补全功能;
|
2025-09-17 11:36:39 +08:00 |
cabbage
|
bfc0c9dcc6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-17 11:30:43 +08:00 |
cabbage
|
c0548c8aa4
|
## 转账、提现添加账户金额是否足够校验;
|
2025-09-17 11:30:38 +08:00 |
sangelxiu1
|
8b52bbb00f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-16 17:07:27 +08:00 |
sangelxiu1
|
5c2b8e6562
|
## Opt - 迁移分享注册流程
|
2025-09-16 17:07:19 +08:00 |
cabbage
|
188b733d80
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-09 17:24:10 +08:00 |