 cabbage
|
d9ab4c8346
|
## 去掉原来不需要MQ推送；奖金明细、奖金来源；
|
2025-09-29 14:02:29 +08:00 |
 sangelxiu1
|
793429a502
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-29 13:58:52 +08:00 |
|
sangelxiu1
|
c11c8be339
|
## Opt - 五折专区
|
2025-09-29 13:58:45 +08:00 |
|
cabbage
|
ad42a04afa
|
## 奖衔升级处理；
|
2025-09-29 13:46:36 +08:00 |
|
cabbage
|
65f23cae4c
|
## 调整奖金入库；
|
2025-09-29 12:00:09 +08:00 |
|
cabbage
|
d197689a19
|
## 奖衔计算，直推会员判断大小区使用团队业绩+个人业绩；
|
2025-09-29 11:33:20 +08:00 |
|
sangelxiu1
|
1e6cc04057
|
## Opt - 业绩统计细化
|
2025-09-29 11:08:26 +08:00 |
|
sangelxiu1
|
7e23a37798
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-29 11:01:34 +08:00 |
|
sangelxiu1
|
866b52a99a
|
## Opt - 业绩统计细化
|
2025-09-29 11:01:25 +08:00 |
|
cabbage
|
d74ccdb898
|
## 奖金来源添加领导奖、平级奖筛选；
|
2025-09-29 10:54:44 +08:00 |
|
cabbage
|
c9da1f307c
|
## 奖金来源添加领导奖、平级奖筛选；
|
2025-09-29 10:27:14 +08:00 |
|
cabbage
|
158751fc38
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-29 10:15:00 +08:00 |
|
cabbage
|
6ff4fd3c1a
|
## 领导奖、平级奖计算；
|
2025-09-29 10:14:48 +08:00 |
|
sangelxiu1
|
0797ca19c7
|
## Opt - 商品详情,42强转41
|
2025-09-29 09:46:30 +08:00 |
 zhangheng
|
072ba08f67
|
## bug421 查询表名修改,查询错误返回错误信息
|
2025-09-29 09:26:02 +08:00 |
|
zhangheng
|
408aa89cc2
|
## bug421 查询表名修改
|
2025-09-29 09:08:21 +08:00 |
|
cabbage
|
cf973fd5b9
|
## 领导奖、平级奖计算；
|
2025-09-28 18:03:21 +08:00 |
|
zhangheng
|
cd4a09d35d
|
## 阶段配置考核奖衔返回值修改
|
2025-09-28 17:53:07 +08:00 |
|
zhangheng
|
5e0fecd8b9
|
## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量
|
2025-09-28 17:23:54 +08:00 |
|
cabbage
|
290793236a
|
## 日结奖衔计算处理；
|
2025-09-28 15:51:45 +08:00 |
|
sangelxiu1
|
3626b3f4cc
|
## Opt - 等级翻译
|
2025-09-28 15:27:23 +08:00 |
|
cabbage
|
5c8c950931
|
## 奖衔实体调整；
|
2025-09-28 13:59:49 +08:00 |
|
sangelxiu1
|
d60a2f2be4
|
## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩
|
2025-09-28 13:40:07 +08:00 |
|
sangelxiu1
|
975665c548
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-28 12:22:59 +08:00 |
|
sangelxiu1
|
215106c4ac
|
## Opt - 市场动态
|
2025-09-28 12:22:51 +08:00 |
|
cabbage
|
4c27a9f9f1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-28 11:31:36 +08:00 |
|
cabbage
|
9258dbb4e1
|
## 结算新字段兼容；
|
2025-09-28 11:31:25 +08:00 |
|
sangelxiu1
|
0a018f5539
|
## Opt - 市场动态
|
2025-09-28 11:12:56 +08:00 |
|
zhangheng
|
18f138caf1
|
## 前台返回提示修改
|
2025-09-28 09:28:28 +08:00 |
|
cabbage
|
a2e0c521aa
|
## 日结处理业绩；
|
2025-09-28 09:04:49 +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
|
e1da81afaa
|
## 导出请求修改
|
2025-09-26 17:48:47 +08:00 |
|
zhangheng
|
89583fe096
|
## 导出请求值修改
|
2025-09-26 17:37:35 +08:00 |
|
zhangheng
|
5ab49626cf
|
## bug419 导出接收字段修改
|
2025-09-26 17:17:20 +08:00 |
|
zhangheng
|
caae0a9d5c
|
## 导出修改,会员子点信息排序
|
2025-09-26 17:00:22 +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
|
ac43ec5553
|
## 会员点位信息分页返回值修改
|
2025-09-26 16:22:54 +08:00 |
|
zhangheng
|
daa9efe4e5
|
## 分页返回值修改
|
2025-09-26 16:14:15 +08:00 |
|
zhangheng
|
6832412c6f
|
## api会员子点信息只传当前会员信息
|
2025-09-26 16:06:26 +08:00 |
|
zhangheng
|
2fe1c41a92
|
## 分页返回值修改
|
2025-09-26 15:41:09 +08:00 |
|
cabbage
|
a99c27a3ff
|
## 赠点如果直推下没有可以填充的，则按血缘上逻辑走；
|
2025-09-26 15:19:55 +08:00 |
|
cabbage
|
9afc8c69cf
|
## 赠点激活阶段填充处理；
|
2025-09-26 14:54:47 +08:00 |
|
zhangheng
|
c2cad9d48e
|
## 会员点位信息为空
|
2025-09-26 14:09:08 +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 |
|
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
|
2d051ef4f5
|
## Opt - 甄选专区限购单笔限购20000
|
2025-09-25 15:12:16 +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
|
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
|
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 |
|
cabbage
|
5d19bb24c5
|
## 阶段收益添加来源会员；
|
2025-09-25 09:48:40 +08:00 |
|
cabbage
|
9495d34a62
|
## 兼容三阶段部分点位为空以及收益处理订单为空；
|
2025-09-25 09:43:56 +08:00 |
|
cabbage
|
7a63b310ba
|
## 每日点位总数处理；添加三阶段奖金发放记录字段；
|
2025-09-24 19:05:58 +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
|
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
|
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
|
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
|
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
|
08bc71c55f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-09-22 15:49:21 +08:00 |