 cabbage
|
73178e4f77
|
## 秒结添加4个累计字段；
|
2025-07-02 10:06:09 +08:00 |
|
cabbage
|
1d032293ce
|
## 秒结添加4个累计字段；
|
2025-07-02 10:02:23 +08:00 |
 sangelxiu1
|
0d8cae6168
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-02 09:23:15 +08:00 |
|
sangelxiu1
|
54ff93f8d6
|
## Fix - H5体系-区域选择
|
2025-07-02 09:23:10 +08:00 |
|
cabbage
|
5d555d155b
|
## 复购商品都有区域分红；区域分红处理时，汇率为空解决；
|
2025-07-01 18:49:53 +08:00 |
|
cabbage
|
b10789bef9
|
## 如果是非合数商品调换货物，商品ID清0处理；
|
2025-07-01 17:56:00 +08:00 |
|
cabbage
|
e4a16d8793
|
## 查询区域分组ID返回字段调整；
|
2025-07-01 17:24:36 +08:00 |
|
cabbage
|
5695114379
|
## 撤单盒数处理修改；
|
2025-07-01 16:17:25 +08:00 |
|
cabbage
|
5a80017d61
|
## 空单会员升级订单报错处理；
|
2025-07-01 16:09:23 +08:00 |
|
cabbage
|
c8291be5ca
|
## 区域分红支持分组处理；
|
2025-07-01 15:53:53 +08:00 |
|
sangelxiu1
|
d00a640aa9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 15:21:05 +08:00 |
|
sangelxiu1
|
ab3a0185d3
|
## Fix - H5体系-区域选择
|
2025-07-01 15:21:00 +08:00 |
|
cabbage
|
f887de2082
|
## 每月区域考核数据生成；
|
2025-07-01 14:53:45 +08:00 |
|
cabbage
|
06263cebbe
|
## 下单计算等级查询盒数支持小数处理；
|
2025-07-01 14:34:52 +08:00 |
|
sangelxiu1
|
6a40dcbe85
|
## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境，BF28195798这个会员伞下一个人都没有，他市场动态下面无数个人[215]
|
2025-07-01 14:23:54 +08:00 |
|
sangelxiu1
|
c92433086f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 14:16:59 +08:00 |
|
sangelxiu1
|
01ea3d0601
|
## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境，BF28195798这个会员伞下一个人都没有，他市场动态下面无数个人[215]
|
2025-07-01 14:16:54 +08:00 |
|
cabbage
|
737fab9b8a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 11:51:05 +08:00 |
|
cabbage
|
908c72fdd7
|
## 结算查询订单返回商品盒数字段调整；
|
2025-07-01 11:51:01 +08:00 |
|
sangelxiu1
|
291540a7fe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-01 11:47:45 +08:00 |
|
sangelxiu1
|
9599b37967
|
## Fix - npe
|
2025-07-01 11:47:40 +08:00 |
|
cabbage
|
99a8b74ec0
|
## 商品盒数支持小数处理；
|
2025-07-01 09:32:40 +08:00 |
|
sangelxiu1
|
7766c46086
|
## Opt - 盒数小数
|
2025-06-30 16:35:22 +08:00 |
|
sangelxiu1
|
0c4bc3900f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-30 14:33:13 +08:00 |
|
sangelxiu1
|
c29f44e835
|
## Opt - 区域体系增加查询条件
|
2025-06-30 14:33:08 +08:00 |
|
cabbage
|
b1390ab3f0
|
## 商品维护添加上传盒数字段；部分枚举国际化去除；
|
2025-06-30 14:27:28 +08:00 |
|
sangelxiu1
|
8c09f2f57e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-30 14:12:09 +08:00 |
|
sangelxiu1
|
37307e859c
|
## Opt - 区域体系增加查询条件
|
2025-06-30 14:12:04 +08:00 |
|
cabbage
|
141af4e930
|
## 奖衔配置调整；去掉4-N配置等；
|
2025-06-30 13:37:51 +08:00 |
|
sangelxiu1
|
cfc9511687
|
## Feat - 盒数调整为小数
|
2025-06-30 11:16:47 +08:00 |
|
sangelxiu1
|
7ee0f2bc8c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-30 10:27:53 +08:00 |
|
sangelxiu1
|
c48916fd6e
|
## Feat - 选择区域增加小区10W验证&按体系分组绑定区域
|
2025-06-30 10:27:44 +08:00 |
|
cabbage
|
040a1eec14
|
## 月度分红处理时，不激活的不计算奖金；
|
2025-06-30 09:24:58 +08:00 |
|
sangelxiu1
|
8f459c779e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 11:47:39 +08:00 |
|
sangelxiu1
|
6a6be83989
|
## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
|
2025-06-27 11:47:34 +08:00 |
|
cabbage
|
363d151793
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 11:43:56 +08:00 |
|
cabbage
|
e5ad6d7bbe
|
## 会员实时奖金返回培育津贴字段；
|
2025-06-27 11:43:53 +08:00 |
|
sangelxiu1
|
b38decfc8b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 11:41:58 +08:00 |
|
sangelxiu1
|
93b2b029a5
|
## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
|
2025-06-27 11:41:52 +08:00 |
|
cabbage
|
b2b1e9510e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 11:40:38 +08:00 |
|
cabbage
|
9dd7d099d5
|
## 奖金来源、奖金汇总、奖金明细添加培训津贴返回以及导出；
|
2025-06-27 11:40:34 +08:00 |
|
sangelxiu1
|
7b1889f6b1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-27 11:27:49 +08:00 |
|
sangelxiu1
|
9f9bdc17ed
|
## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade)
|
2025-06-27 11:27:30 +08:00 |
|
cabbage
|
18519ad213
|
## 日结处理荣誉奖衔；
|
2025-06-27 10:35:53 +08:00 |
|
cabbage
|
232edd3706
|
## 培育津贴；
|
2025-06-27 09:19:20 +08:00 |
|
cabbage
|
ae1d6a3ce1
|
## 去掉奖金没用的实体；
|
2025-06-26 15:08:43 +08:00 |
|
cabbage
|
5b920ff44f
|
## 去掉不用的4-N等老奖金处理；去掉荣誉墙、推荐达人等；
|
2025-06-26 10:00:16 +08:00 |
|
cabbage
|
ecbf6d85cb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 17:58:49 +08:00 |
|
cabbage
|
5202702654
|
## 手动开通V1V2单独判断升级；
|
2025-06-25 17:58:19 +08:00 |
woody
|
b1a9d9de0f
|
Merge branch 'dev' of 47.94.45.65:angelo/java-retail-app into dev
|
2025-06-25 17:48:23 +08:00 |