cabbage
|
04cde3b30d
|
## 去掉部分不需要的实体及注释;
|
2025-06-25 13:56:04 +08:00 |
cabbage
|
b4af4adb72
|
## 奖金来源、奖金明细显示以及导出调整;
|
2025-06-25 13:50:27 +08:00 |
cabbage
|
a3c8957025
|
## 复购级差收益累计以及备注调整;
|
2025-06-25 11:34:16 +08:00 |
cabbage
|
c3d69d0b28
|
## 会员H5奖金明细月奖字段返回调整;
|
2025-06-25 11:08:41 +08:00 |
cabbage
|
aa2f880313
|
## 默认月结期间表取值调整;
|
2025-06-25 10:49:07 +08:00 |
cabbage
|
dc2c62cbb3
|
## 2025.06.25需求,因V1-V3注册、升级多送两级,非手动V3V4可以再购买升V5;
|
2025-06-25 10:23:35 +08:00 |
sangelxiu1
|
c548652b0a
|
## Fix - 初始化
|
2025-06-24 10:03:15 +08:00 |
sangelxiu1
|
a2577ddd97
|
## Fix - npe
|
2025-06-24 09:35:46 +08:00 |
cabbage
|
3c0f8cfc97
|
## 前台会员明细返回;
|
2025-06-23 17:58:51 +08:00 |
cabbage
|
a4c4a7c135
|
## 奖金明细、奖金来源新奖金字段;
|
2025-06-23 17:49:19 +08:00 |
cabbage
|
967e0e851d
|
## 月度分红处理;
|
2025-06-23 16:43:49 +08:00 |
cabbage
|
5e0d9f2ff4
|
## 调整发货方法;
|
2025-06-23 15:41:48 +08:00 |
cabbage
|
3f6ae948da
|
## 添加测试结算日志;
|
2025-06-23 14:24:32 +08:00 |
cabbage
|
0854376e90
|
## 测试环境月结奖衔取当前期间;
|
2025-06-23 14:23:04 +08:00 |
cabbage
|
4a376e936b
|
## 发货导出模板字段调整;
|
2025-06-23 13:27:24 +08:00 |
cabbage
|
2731274f58
|
## 月奖月度级差、复购级差;
|
2025-06-23 11:58:10 +08:00 |
cabbage
|
0fb3074768
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-21 09:06:18 +08:00 |
cabbage
|
b3a12a62f0
|
## 计算分红奖衔时,自己消费的虚拟区也算一个区;
|
2025-06-21 09:06:07 +08:00 |
sangelxiu1
|
1a083b499b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-20 18:15:21 +08:00 |
sangelxiu1
|
c1bb43f3bd
|
## Opt - 增加修改结算等级->最高等级下进行奖衔初始化
|
2025-06-20 18:15:13 +08:00 |
cabbage
|
55f5e0523d
|
## 分红奖衔秒结处理;
|
2025-06-20 17:06:06 +08:00 |
cabbage
|
724ff1ae61
|
## 分红奖衔撤单回退处理;
|
2025-06-19 17:40:34 +08:00 |
cabbage
|
17e5a70f85
|
## 会员列表返回分红奖衔;当月奖衔分析搜索条件报错处理;
|
2025-06-19 16:06:30 +08:00 |
cabbage
|
7a17c2127e
|
## get-info返回分红奖衔;
|
2025-06-19 15:39:54 +08:00 |
cabbage
|
a35e468103
|
## 秒结、日结恢复分红奖衔;
|
2025-06-19 15:30:23 +08:00 |
sangelxiu1
|
f7f995c9c3
|
## Feat - 手改注册等级为合伙人时,如奖衔为空,则改为黄宝
|
2025-06-19 13:38:58 +08:00 |
cabbage
|
164a336558
|
## 替换国际化处理;
|
2025-06-18 16:46:04 +08:00 |
cabbage
|
dfc21bc3bd
|
## 等级枚举不走国际化;
|
2025-06-18 16:35:12 +08:00 |
cabbage
|
e623987b61
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-18 11:22:26 +08:00 |
cabbage
|
af9a71f31a
|
## 调整部门获取下个编号方法;
|
2025-06-18 11:22:21 +08:00 |
sangelxiu1
|
8804791eca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-18 11:06:44 +08:00 |
sangelxiu1
|
f4e2d9a16d
|
## Fix - 自动登录,获取systemType异常
|
2025-06-18 11:06:38 +08:00 |
cabbage
|
2feb0076e1
|
## 免密登录不校验用户支付状态;去掉7位用户编号单独登录方法;
|
2025-06-18 10:55:44 +08:00 |
cabbage
|
7bf86ffad5
|
## 处理业绩表方法;
|
2025-06-17 17:33:53 +08:00 |
cabbage
|
3c679ce8a8
|
## 推荐正反查调整处理方式;
|
2025-06-17 17:28:17 +08:00 |
cabbage
|
f79e4a7ab6
|
## 真实奖衔分析、等级升级查询;
|
2025-06-17 16:57:14 +08:00 |
cabbage
|
45e3ec095c
|
## 去掉旧抗衰达人,调整推荐相关列表;
|
2025-06-17 16:03:53 +08:00 |
cabbage
|
e89e09371f
|
## 等级修改、0元注册、删除空点相关接口调整;
|
2025-06-17 15:43:29 +08:00 |
sangelxiu1
|
52f8a8585f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-17 13:58:24 +08:00 |
sangelxiu1
|
03780c8925
|
## Fix - 盒数计算大小区后排除注水
|
2025-06-17 13:58:19 +08:00 |
cabbage
|
13ee5b8ee1
|
## 判断升级时,添加本身注水盒数处理;
|
2025-06-17 13:21:31 +08:00 |
cabbage
|
555bfecd30
|
## 调整等级判断处理,注水单独处理;
|
2025-06-17 11:26:08 +08:00 |
sangelxiu1
|
b84e3439ee
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-17 11:08:13 +08:00 |
sangelxiu1
|
b425609f79
|
## Fix - teambox调整为不包含注水,计算大小区需要加上两个注水属性,计算总数时无需再排除注水
|
2025-06-17 11:08:06 +08:00 |
cabbage
|
34b1b8632a
|
## 日结添加团队月盒数字段及处理;月奖查询订单不走dubbo服务,改为自查询;
|
2025-06-17 10:46:35 +08:00 |
sangelxiu1
|
2bd224b3d4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-17 09:39:32 +08:00 |
sangelxiu1
|
2615f517de
|
## Fix - 盒数(小区盒数) & 市场动态-本月盒数(日结.MONTH_BOX_NUM + TEAM_MONTH_BOX_NUM + 秒结.NEW_BOX_NUM + TEAM_NEW_BOX_NUM)
|
2025-06-17 09:39:25 +08:00 |
cabbage
|
f4899490de
|
## 更新奖衔语句问题处理;
|
2025-06-16 15:00:28 +08:00 |
cabbage
|
174fe27340
|
## 更新奖衔语句问题处理;
|
2025-06-16 14:51:42 +08:00 |
cabbage
|
ad8c536b68
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-16 10:09:49 +08:00 |
cabbage
|
b386dda7ba
|
## 等级处理改为逻辑删除;
|
2025-06-16 10:09:45 +08:00 |
sangelxiu1
|
344f10a3e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-16 10:00:16 +08:00 |
sangelxiu1
|
9020247e9a
|
## Fix - 市场动态-业绩列表为0
|
2025-06-16 10:00:11 +08:00 |
cabbage
|
73b70e4fa0
|
## 自己月累计业绩处理;
|
2025-06-16 09:56:33 +08:00 |
cabbage
|
7cb0035eb7
|
## 奖衔处理全部改为逻辑删除和查询;
|
2025-06-16 09:44:45 +08:00 |
cabbage
|
5ebfd640c2
|
## 新需求,注册、升级支付多送两级;
|
2025-06-16 09:31:10 +08:00 |
cabbage
|
e0fafbe410
|
## 收货地址调整注释;
|
2025-06-16 09:09:50 +08:00 |
cabbage
|
4ae4b5178e
|
## 是否支付为空校验;
|
2025-06-16 08:54:40 +08:00 |
cabbage
|
b9ddee109f
|
## 新需求,注册、升级支付多送两级;
|
2025-06-14 16:31:35 +08:00 |
sangelxiu1
|
ea76dfab3b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-14 14:08:40 +08:00 |
sangelxiu1
|
7f03ef8e7a
|
## Fix - 市场动态-小区业绩[bugID=197【H5】如截图,RE55691589这个会员的市场动态里,红框中的盒数和业绩应该有值才对]
|
2025-06-14 14:08:33 +08:00 |
cabbage
|
c26b132642
|
## 空单注册报错处理(195);
|
2025-06-14 14:07:03 +08:00 |
cabbage
|
c98511ecb3
|
## 修改户籍短信校验调整(181);
|
2025-06-14 13:29:18 +08:00 |
cabbage
|
836b1fbdea
|
## 空单注册是否激活处理(195);
|
2025-06-14 11:10:24 +08:00 |
sangelxiu1
|
3df2c1b987
|
## Fix - 市场动态-小区业绩
|
2025-06-14 10:46:33 +08:00 |
sangelxiu1
|
7a88013554
|
## Fix - 本月=昨日月 + 今日个人 + 今日团队
|
2025-06-14 09:55:24 +08:00 |
sangelxiu1
|
b0658f1bc3
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-14 09:47:41 +08:00 |
sangelxiu1
|
06653aaa9a
|
## Opt - 调整去除注水的位置
|
2025-06-14 09:47:34 +08:00 |
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 |
cabbage
|
684ecdb098
|
## 区域收益改为商品价格的5%;盒数大小区计算调整;秒结计算等级以会员表关系为主查询;
|
2025-06-12 13:28:52 +08:00 |
woody
|
1c77821a24
|
feat(CuMember): 直推列表添加手机号字段
|
2025-06-12 09:06:25 +08:00 |
cabbage
|
afe5a82e6e
|
## 注册、升级、复购、重消订单业绩、盒数都算自己小区;
|
2025-06-11 19:30:13 +08:00 |
cabbage
|
816aa2fdb6
|
## 升级订单等级计算处理;
|
2025-06-11 16:56:37 +08:00 |
cabbage
|
68827b97f2
|
## 撤单激活处理(168);
|
2025-06-11 16:28:57 +08:00 |
cabbage
|
e8bba0ae80
|
## 门票价格显示(169);
|
2025-06-11 16:25:55 +08:00 |
cabbage
|
a687acd4f3
|
## 注册成功返回地址;
|
2025-06-11 16:20:17 +08:00 |
cabbage
|
78c9b8d038
|
## 升级方式改为一次性补差升级;
|
2025-06-11 16:11:50 +08:00 |
cabbage
|
5cedaa4f2e
|
## 撤单处理盒数、业绩等;
|
2025-06-11 15:39:32 +08:00 |
sangelxiu1
|
eb34a8eea9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-11 14:38:46 +08:00 |
sangelxiu1
|
279a17cf1e
|
## Opt - 选择收益区域
|
2025-06-11 14:38:39 +08:00 |
cabbage
|
190c8b3c9d
|
## 处理语句报错;
|
2025-06-11 14:03:39 +08:00 |
cabbage
|
ffc688d029
|
## 区域分红收益处理;
|
2025-06-11 13:49:11 +08:00 |
cabbage
|
75ad4f97a3
|
## 报单时激活判断调整;还原指定商品盒数累计;
|
2025-06-11 11:57:21 +08:00 |
cabbage
|
622a066e0f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-11 11:05:29 +08:00 |
cabbage
|
438f4b2cf3
|
## 调整生成奖金索引;
|
2025-06-11 11:05:25 +08:00 |
sangelxiu1
|
7f031633f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-10 20:34:00 +08:00 |
sangelxiu1
|
db5cf31ffc
|
## Opt - 非空验证.
|
2025-06-10 20:33:54 +08:00 |
cabbage
|
7e20c1d0ed
|
## 秒结和日结中盒数、业绩上传处理;等级、奖衔计算处理;
|
2025-06-10 20:31:14 +08:00 |
cabbage
|
07d9dcc558
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-10 17:58:30 +08:00 |
cabbage
|
ee155ff59b
|
## 注册升级购买指定商品,则会员为激活;
|
2025-06-10 17:58:23 +08:00 |
sangelxiu1
|
b0cc64ade4
|
## Opt - 户籍变更->万能验证码
|
2025-06-10 17:50:50 +08:00 |
sangelxiu1
|
46488c8128
|
## Opt - 删除获取订单状态接口
|
2025-06-10 17:14:06 +08:00 |
cabbage
|
d69566eeef
|
## 秒结等级、奖衔处理,业绩、盒数上传处理;部分枚举替换;
|
2025-06-10 15:45:02 +08:00 |
cabbage
|
8d0ed5cc76
|
## 升级订单处理等级返回调整;
|
2025-06-10 15:06:37 +08:00 |
cabbage
|
2d14f67f21
|
## 升级订单撤单处理逻辑调整;
|
2025-06-10 14:57:29 +08:00 |
cabbage
|
cf532f5980
|
## 校验会员等级返回异常处理调整;
|
2025-06-09 20:29:54 +08:00 |
cabbage
|
eb0e6e54b8
|
## 调整查询方式;
|
2025-06-09 17:35:00 +08:00 |
sangelxiu1
|
42ede2b927
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-09 16:58:44 +08:00 |
cabbage
|
bbc299e50a
|
## 调整代码逻辑;
|
2025-06-09 16:55:32 +08:00 |
cabbage
|
f9c50f26c3
|
## 升级、复购恢复撤单逻辑;商品列表返回字段调整;
|
2025-06-09 16:37:08 +08:00 |
cabbage
|
8ddb794ada
|
## 复购、重消订单下单处理;
|
2025-06-09 15:48:48 +08:00 |
cabbage
|
e635528d63
|
## 注册相关接口修改完善;
|
2025-06-09 15:12:43 +08:00 |
sangelxiu1
|
57b854e56d
|
## Opt - 参考北大-未配置业务手续费情况下默认给0
|
2025-06-09 15:09:43 +08:00 |
sangelxiu1
|
1d884bf9bc
|
## Opt - 删除isMakerSpace属性映射
|
2025-06-09 14:33:55 +08:00 |
sangelxiu1
|
7879490f8a
|
## Opt - 取消验证身份证有效期
|
2025-06-09 14:14:44 +08:00 |
cabbage
|
66a246bab9
|
## get-info返回国家;
|
2025-06-09 14:07:56 +08:00 |
cabbage
|
8adde9fc1d
|
## 调整get-info接口;判断选择区域条件改为血缘累计业绩30万;
|
2025-06-09 10:46:08 +08:00 |
sangelxiu1
|
5fc0054d75
|
## Opt - 取消手机号唯一验证
|
2025-06-09 10:37:55 +08:00 |
cabbage
|
45a4599ccc
|
## 因手机号可以重复,登录时只能使用账号进行登录;
|
2025-06-09 10:37:44 +08:00 |
cabbage
|
309d12a97c
|
## 调整部分三方定时任务注释;
|
2025-06-09 10:37:05 +08:00 |
cabbage
|
691766da64
|
## 调整部分三方注释;
|
2025-06-09 09:53:29 +08:00 |
cabbage
|
bf08c889e6
|
## 仓储发库同步功能;
|
2025-06-08 16:29:05 +08:00 |
cabbage
|
07ffadeab0
|
## 调整部分代码逻辑;
|
2025-06-08 16:05:57 +08:00 |
cabbage
|
ae5df106d7
|
## 初始化去掉部分不需要接口;
|
2025-06-06 16:58:45 +08:00 |
cabbage
|
6095ec5e0e
|
## 初始化去掉部分不需要接口;
|
2025-06-06 16:50:22 +08:00 |
cabbage
|
2618a75292
|
## 初始化去掉部分不需要接口;
|
2025-06-06 10:29:15 +08:00 |
cabbage
|
794587a0be
|
## 去掉不需要邮件发送等逻辑;
|
2025-05-30 17:36:33 +08:00 |
cabbage
|
670900d1d3
|
## 初始化调整;
|
2025-05-27 15:03:45 +08:00 |