Commit Graph

191 Commits

Author SHA1 Message Date
sangelxiu1 4e7f787c32 Merge remote-tracking branch 'origin/dev' into dev 2025-10-15 15:19:00 +08:00
sangelxiu1 f0546a0716 ## Opt - 分享商品列表 增加查询条件(商品名/商品类别) 2025-10-15 15:18:51 +08:00
cabbage 545d17037a ## 系统类型改为众康; 2025-10-15 14:57:09 +08:00
cabbage 31f8fa8122 ## 调整众康系统编号前缀; 2025-10-15 14:44:19 +08:00
cabbage 4c4407613d ## 甄选专区改为复购专区;商城专区改为北大甄选; 2025-10-14 09:40:30 +08:00
cabbage 15957eec18 ## 众康领导奖、平级改为超500PV按500计算; 2025-10-13 13:22:28 +08:00
cabbage 37fc265fd3 ## 顶点奖金拨比统计定时任务;顶点奖金拨比列表统计; 2025-10-11 17:16:10 +08:00
cabbage b05518994c ## 奖金表添加冗余字段; 2025-10-10 17:08:39 +08:00
cabbage 9d20405ca8 ## 消费配置取值走枚举; 2025-10-10 09:40:30 +08:00
zhangheng 4f168e9a14 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 10:39:02 +08:00
cabbage 83136f1387 ## 奖衔计算方式改为先算奖衔;赠点排点方式问题修复; 2025-09-29 18:01:35 +08:00
sangelxiu1 8b5d7a5f9d ## Opt - 手机端奖金明细 2025-09-29 15:23:02 +08:00
cabbage d9ab4c8346 ## 去掉原来不需要MQ推送;奖金明细、奖金来源; 2025-09-29 14:02:29 +08:00
cabbage 65f23cae4c ## 调整奖金入库; 2025-09-29 12:00:09 +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 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 6e730f5da1 ## Fix - 甄选专区的订单撤单失败[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=423] 2025-09-29 09:39:53 +08:00
cabbage cf973fd5b9 ## 领导奖、平级奖计算; 2025-09-28 18:03:21 +08:00
zhangheng 5e0fecd8b9 ## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量 2025-09-28 17:23:54 +08:00
cabbage 290793236a ## 日结奖衔计算处理; 2025-09-28 15:51:45 +08:00
cabbage 5c8c950931 ## 奖衔实体调整; 2025-09-28 13:59:49 +08:00
cabbage 75d68a34d8 ## 奖衔实体调整; 2025-09-28 13:59:17 +08:00
cabbage bc0f51446f ## 日结处理业绩; 2025-09-26 17:54:28 +08:00
cabbage 9afc8c69cf ## 赠点激活阶段填充处理; 2025-09-26 14:54:47 +08:00
zhangheng 18e62e2d6b ## 三阶段架构列表数据,会员子点位信息 2025-09-26 09:39:54 +08:00
cabbage 737f118daf ## 二三阶段数据补全; 2025-09-25 18:07:36 +08:00
cabbage b18b984b5a ## 三阶段奖金生成; 2025-09-25 13:35:21 +08:00
zhangheng d2a4c012c7 ## 三阶段架构会员名称添加点位信息 2025-09-25 11:13:28 +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 7a63b310ba ## 每日点位总数处理;添加三阶段奖金发放记录字段; 2025-09-24 19:05:58 +08:00
cabbage bacbb61168 ## 一二三阶段填充点位数据;一二阶段奖金计算; 2025-09-24 18:00:36 +08:00
sangelxiu1 07f8dbe8d3 ## Feat - 业绩统计 2025-09-23 11:54:03 +08:00
zhangheng 12d1e8f0f8 ## 三阶段架构使用枚举,修改节点名称 2025-09-23 10:08:15 +08:00
cabbage 7a5bc55ddf ## 一阶段结算入库; 2025-09-22 19:24:00 +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
cabbage abe46ad69e ## 一阶段填充点位逻辑调整; 2025-09-22 15:49:15 +08:00
zhangheng 619e6f1006 ## 三阶段架构,子会员节点查询 2025-09-22 15:13:12 +08:00
cabbage e3fae413a6 ## 阶段收益入库操作;封装阶段收益使用备注等; 2025-09-21 10:47:40 +08:00
cabbage bcc4cfed88 ## 一阶段点位填充处理; 2025-09-19 18:14:50 +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 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
cabbage c37e19f473 ## 阶段奖金计算处理(未完成); 2025-09-18 16:56:54 +08:00
sangelxiu1 b58445962e ## Opt - 精品专区单订单金额上限 2025-09-18 16:01:00 +08:00