 sangelxiu1
|
a3aee14a0e
|
## Opt - 手机端奖金明细
|
2025-09-29 15:18:17 +08:00 |
 cabbage
|
15dba62617
|
## 赠送点位处理；
|
2025-09-29 14:32:55 +08:00 |
|
cabbage
|
f388e583f1
|
## 去掉原来不需要MQ推送；奖金明细、奖金来源；
|
2025-09-29 14:32:54 +08:00 |
|
sangelxiu1
|
06a9ada5a6
|
## Opt - 五折专区
|
2025-09-29 13:59:11 +08:00 |
|
cabbage
|
27fcffa5ca
|
## 奖衔升级处理；
|
2025-09-29 13:46:55 +08:00 |
|
cabbage
|
2d683d0a58
|
## 调整奖金入库；
|
2025-09-29 13:46:54 +08:00 |
|
cabbage
|
c2dce5274c
|
## 奖衔计算，直推会员判断大小区使用团队业绩+个人业绩；
|
2025-09-29 11:33:58 +08:00 |
|
sangelxiu1
|
b1c1ec9074
|
## Opt - 业绩统计细化
|
2025-09-29 11:08:40 +08:00 |
|
sangelxiu1
|
1a477878c9
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-29 11:00:53 +08:00 |
|
sangelxiu1
|
ddf974e33c
|
## Opt - 业绩统计细化
|
2025-09-29 11:00:45 +08:00 |
|
cabbage
|
883be1c8a7
|
## 奖金来源添加领导奖、平级奖筛选；
|
2025-09-29 10:55:00 +08:00 |
|
cabbage
|
3e7c57c2a0
|
## 奖金来源添加领导奖、平级奖筛选；
|
2025-09-29 10:55:00 +08:00 |
|
cabbage
|
f5584a64c7
|
## 领导奖、平级奖计算；
|
2025-09-29 10:15:18 +08:00 |
|
sangelxiu1
|
a1e7a85fc5
|
## Opt - 商品详情,42强转41
|
2025-09-29 09:53:22 +08:00 |
 zhangheng
|
7f6ac2347a
|
## bug421 查询表名修改,查询错误返回错误信息
|
2025-09-29 09:26:16 +08:00 |
|
zhangheng
|
c21f641973
|
## bug421 查询表名修改
|
2025-09-29 09:08:57 +08:00 |
|
cabbage
|
4ec7863084
|
## 领导奖、平级奖计算；
|
2025-09-28 18:03:47 +08:00 |
|
zhangheng
|
a2a828d71a
|
## 阶段配置考核奖衔返回值修改
|
2025-09-28 17:53:31 +08:00 |
|
zhangheng
|
6ded77fea8
|
## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量
|
2025-09-28 17:24:35 +08:00 |
|
cabbage
|
0378dd3d50
|
## 日结奖衔计算处理；
|
2025-09-28 15:52:10 +08:00 |
|
sangelxiu1
|
5ca7df77ee
|
## Opt - 等级翻译
|
2025-09-28 15:27:34 +08:00 |
|
sangelxiu1
|
50c9fc0a1d
|
## Opt - 市场动态
|
2025-09-28 14:11:20 +08:00 |
|
cabbage
|
1fc421a74d
|
## 奖衔实体调整；
|
2025-09-28 14:03:34 +08:00 |
|
sangelxiu1
|
6442f2bbfb
|
## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩
|
2025-09-28 13:40:40 +08:00 |
|
cabbage
|
e5c1287d22
|
## 结算新字段兼容；
|
2025-09-28 11:32:20 +08:00 |
|
sangelxiu1
|
3b5a79806f
|
Merge remote-tracking branch 'origin/test' into test
|
2025-09-28 11:12:38 +08:00 |
|
sangelxiu1
|
994b670493
|
## Opt - 市场动态
|
2025-09-28 11:12:29 +08:00 |
|
zhangheng
|
7374400936
|
## 前台返回提示修改
|
2025-09-28 10:04:27 +08:00 |
|
cabbage
|
f336435346
|
## 日结处理业绩；
|
2025-09-28 09:06:00 +08:00 |
|
cabbage
|
e4e58f0253
|
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
# bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
# bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
|
2025-09-26 18:03:36 +08:00 |
|
cabbage
|
6db021e8b0
|
## 日结处理业绩；
|
2025-09-26 17:55:40 +08:00 |
|
cabbage
|
1595f11723
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-26 17:54:37 +08:00 |
|
cabbage
|
bc0f51446f
|
## 日结处理业绩；
|
2025-09-26 17:54:28 +08:00 |
|
zhangheng
|
f832063a17
|
## 导出请求修改
|
2025-09-26 17:49:09 +08:00 |
|
zhangheng
|
e1da81afaa
|
## 导出请求修改
|
2025-09-26 17:48:47 +08:00 |
|
zhangheng
|
db2d7f365c
|
## 导出请求值修改
|
2025-09-26 17:37:56 +08:00 |
|
zhangheng
|
89583fe096
|
## 导出请求值修改
|
2025-09-26 17:37:35 +08:00 |
|
zhangheng
|
611121162b
|
## bug419 导出接收字段修改
|
2025-09-26 17:17:42 +08:00 |
|
zhangheng
|
5ab49626cf
|
## bug419 导出接收字段修改
|
2025-09-26 17:17:20 +08:00 |
|
zhangheng
|
299686f9a9
|
## 导出修改,会员子点信息排序
|
2025-09-26 17:07:34 +08:00 |
|
zhangheng
|
2955a2038e
|
## 会员点位信息排序查询
|
2025-09-26 17:06:12 +08:00 |
|
zhangheng
|
caae0a9d5c
|
## 导出修改,会员子点信息排序
|
2025-09-26 17:00:22 +08:00 |
|
sangelxiu1
|
ca9890ad4c
|
## Opt - 秒结-甄选数据算在注册专区
|
2025-09-26 16:46:31 +08:00 |
|
sangelxiu1
|
5ade87a91d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-26 16:45:32 +08:00 |
|
sangelxiu1
|
301648f213
|
## Opt - 秒结-甄选数据算在注册专区
|
2025-09-26 16:45:25 +08:00 |
|
zhangheng
|
110cef3674
|
## 会员点位信息排序查询
|
2025-09-26 16:39:18 +08:00 |
|
zhangheng
|
d71ce0a57b
|
## 会员点位信息分页返回值修改
|
2025-09-26 16:23:06 +08:00 |
|
zhangheng
|
ac43ec5553
|
## 会员点位信息分页返回值修改
|
2025-09-26 16:22:54 +08:00 |
|
zhangheng
|
2384859022
|
## 分页返回值修改
|
2025-09-26 16:14:35 +08:00 |
|
zhangheng
|
daa9efe4e5
|
## 分页返回值修改
|
2025-09-26 16:14:15 +08:00 |
|
zhangheng
|
9718739da4
|
## api会员子点信息只传当前会员信息
|
2025-09-26 16:06:40 +08:00 |
|
zhangheng
|
6832412c6f
|
## api会员子点信息只传当前会员信息
|
2025-09-26 16:06:26 +08:00 |
|
zhangheng
|
1393e24989
|
## 分页返回值修改
|
2025-09-26 15:50:51 +08:00 |
|
zhangheng
|
af5dbcc788
|
## 三阶段架构列表数据,会员子点位信息
|
2025-09-26 15:50:20 +08:00 |
|
zhangheng
|
2fe1c41a92
|
## 分页返回值修改
|
2025-09-26 15:41:09 +08:00 |
|
cabbage
|
1fea92b74b
|
## 赠点如果直推下没有可以填充的，则按血缘上逻辑走；
|
2025-09-26 15:20:18 +08:00 |
|
cabbage
|
a99c27a3ff
|
## 赠点如果直推下没有可以填充的，则按血缘上逻辑走；
|
2025-09-26 15:19:55 +08:00 |
|
cabbage
|
a41cd10d4d
|
## 赠点激活阶段填充处理；
|
2025-09-26 14:56:13 +08:00 |
|
cabbage
|
9afc8c69cf
|
## 赠点激活阶段填充处理；
|
2025-09-26 14:54:47 +08:00 |
|
zhangheng
|
6f6dcae8b8
|
## 会员点位信息为空
|
2025-09-26 14:09:32 +08:00 |
|
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 |