angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity
117 Commits 4 Branches 0 Tags 11 MiB
Commit Graph

99 Commits

Author SHA1 Message Date
cabbage 2f6e9da598 ## 计算会员等级直推会员不算注水；奖金公布接口调整； 2025-06-14 09:47:07 +08:00
cabbage da6ffb525d Merge remote-tracking branch 'origin/dev' into dev 2025-06-14 09:45:38 +08:00
cabbage 19de07fd43 ## get-info返回会员荣誉奖衔； 2025-06-14 09:45:28 +08:00
sangelxiu1 68141eb9ff Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 18:25:13 +08:00
sangelxiu1 02453df49a ## Opt - 市场动态-查询条件 2025-06-13 18:25:06 +08:00
cabbage 634f657163 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 18:18:42 +08:00
cabbage 0e2a1f2571 ## 复购商品区域分红按指定的价格进行处理； 2025-06-13 18:18:37 +08:00
sangelxiu1 9d6fd9b7a8 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 18:14:19 +08:00
sangelxiu1 f0a8c658f5 ## Opt - 业绩独立大小区条件&市场动态列表接口 2025-06-13 18:14:13 +08:00
cabbage 503d993540 ## 累积盒数处理循环修改； 2025-06-13 18:07:58 +08:00
cabbage c410d4faa4 ## 商品管理添加复购区域分红； 2025-06-13 17:52:00 +08:00
cabbage d2474562db ## 伞下直推业绩统计报错（178）； 2025-06-13 16:57:46 +08:00
cabbage 7403bb2b86 ## 户籍变更不需要处理手续费（181）； 2025-06-13 16:43:40 +08:00
cabbage 6354b2aa09 ## 忘记密码支持多手机号（182）； 2025-06-13 16:35:29 +08:00
sangelxiu1 287cc279b4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 15:25:58 +08:00
sangelxiu1 5577de14e5 ## Fix - 盒数大小区逻辑 2025-06-13 15:25:51 +08:00
cabbage f98a1fe2af ## 奖金明细去掉分页； 2025-06-13 15:12:10 +08:00
sangelxiu1 f74abd210f ## Opt - 市场动态部分代码 2025-06-13 15:06:26 +08:00
sangelxiu1 8a87410289 ## Fix - 选择区域 计算自己业绩 2025-06-13 15:05:47 +08:00
sangelxiu1 be32dd5151 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 15:03:45 +08:00
sangelxiu1 bb175563f5 ## Fix - 选择区域 计算自己业绩 2025-06-13 15:03:40 +08:00
cabbage d2cdceec1c Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 14:33:56 +08:00
cabbage 2543767de6 ## 平级收益价格按单商品处理； 2025-06-13 14:33:51 +08:00
sangelxiu1 bfff613752 ## Opt - mq补偿增加业绩 2025-06-13 14:33:09 +08:00
sangelxiu1 d1a4f364ca Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 14:32:33 +08:00
sangelxiu1 401adc07e0 ## Opt - mq补偿增加业绩 2025-06-13 14:32:27 +08:00
cabbage 3f66820e55 ## 奖金明细、奖金汇总接口调整； 2025-06-13 14:16:09 +08:00
sangelxiu1 cf7924b143 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 13:52:59 +08:00
sangelxiu1 e0921965a7 ## Opt - 我的->盒数 
业绩除万,四位小数
 2025-06-13 13:52:53 +08:00
cabbage 01606f64bd ## 计算平级时，保留6位小数； 2025-06-13 13:24:59 +08:00
cabbage 1d31ef09a5 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 12:02:57 +08:00
cabbage 2411a8d22c ## 查询昨日奖金汇总接口； 2025-06-13 12:02:53 +08:00
sangelxiu1 8d3408c421 ## Opt - 我的->盒数 
增加激活时间判断 & 计算达小区时包含注水,返回前台数据时剔出注水
 2025-06-13 12:02:06 +08:00
sangelxiu1 ac6dc2c5cd Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 11:41:17 +08:00
sangelxiu1 3d3d250305 ## Fix - 新用户后台改等级 没有日结造成npe 2025-06-13 11:41:11 +08:00
cabbage 3cc33fe23f Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 10:44:15 +08:00
cabbage ae81f09aa5 ## 后台办理业务手动激活推送秒结状态MQ； 2025-06-13 10:44:11 +08:00
sangelxiu1 b7b487a7d4 Merge remote-tracking branch 'origin/dev' into dev 2025-06-13 10:39:55 +08:00
sangelxiu1 4d5e592019 ## Feat - 新增秒结补偿MQ逻辑 
查当前ID伞下秒结表的sum(NEW_BOX_NUM)更新至当前用户的TEAM_NEW_BOX_NUM
 2025-06-13 10:39:49 +08:00
cabbage f5b00b773e ## 后台办理业务手动激活推送秒结状态MQ； 2025-06-13 10:38:50 +08:00
cabbage b32e00d74e ## 升级订单添加激活MQ推送； 2025-06-13 09:59:30 +08:00
cabbage 8363daf3b9 ## get-info返回是否激活； 2025-06-13 09:21:19 +08:00
woody 3a7ff8afb0 feat(MemberEmptyService): 空单注册不校验手机号 2025-06-13 09:03:12 +08:00
cabbage 957dc0f8a4 ## 结算时处理手动激活的数据处理； 2025-06-12 20:39:15 +08:00
sangelxiu1 c921750b2e Merge remote-tracking branch 'origin/dev' into dev 2025-06-12 20:27:25 +08:00
sangelxiu1 b62724a7e6 ## Fix - 查询区域偶发带分页&查询会员盒数 2025-06-12 20:27:19 +08:00
cabbage 97b828b4b9 ## 秒结、日结处理会员激活状态； 2025-06-12 17:03:38 +08:00
cabbage bbb91a7428 ## 直推收益、平级收益处理； 2025-06-12 15:22:38 +08:00
sangelxiu1 cd3c17c6dc ## Opt - 重构统计盒数逻辑 2025-06-12 14:37:33 +08:00
cabbage 4bca022430 ## 直推收益、平级收益处理； 2025-06-12 14:29:05 +08:00