 sangelxiu1
|
04d0c20c77
|
## Feat - 退款驳回
|
2025-07-09 13:49:36 +08:00 |
 cabbage
|
a5f41adab9
|
## 去除站点配置相关；
|
2025-07-09 11:49:34 +08:00 |
|
cabbage
|
0dbc58f58b
|
## 特殊体系复购级差奖项；
|
2025-07-09 11:18:07 +08:00 |
|
cabbage
|
e8d9cab955
|
## 去掉进销存相关内容；
|
2025-07-09 11:16:15 +08:00 |
|
sangelxiu1
|
613c8a8002
|
## Feat - 新零售-支付
|
2025-07-09 10:59:32 +08:00 |
|
cabbage
|
d9e9589d70
|
## 会员升级奖衔处理优化；
|
2025-07-07 15:44:54 +08:00 |
|
cabbage
|
dec97f793e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-07 10:43:11 +08:00 |
|
cabbage
|
75380f03d7
|
## 添加日志；调整订单类型判断位置；
|
2025-07-07 10:43:06 +08:00 |
|
sangelxiu1
|
23db6a8918
|
## Opt - 空值验证
|
2025-07-05 10:18:03 +08:00 |
|
sangelxiu1
|
0ef00695f8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-05 09:56:32 +08:00 |
|
sangelxiu1
|
4bef2feacd
|
## Opt - 空值验证
|
2025-07-05 09:56:26 +08:00 |
|
cabbage
|
8eb6ee8586
|
## 秒结兼容多送2级处理问题；
|
2025-07-04 18:29:00 +08:00 |
|
cabbage
|
f2f9e0ac22
|
## 分红奖衔处理调整；
|
2025-07-04 14:53:10 +08:00 |
|
cabbage
|
52fa865a08
|
## 撤单秒结盒数、业绩应该扣减；
|
2025-07-04 11:15:46 +08:00 |
|
cabbage
|
4647412b32
|
## 撤单回退盒数业绩处理（227）；盒数累计改为直接取订单盒数不再重新计算；
|
2025-07-04 09:52:51 +08:00 |
|
sangelxiu1
|
fbd6a2e033
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 09:32:25 +08:00 |
|
sangelxiu1
|
dd7c121577
|
## Opt - 盒数&业绩(ALL_)
|
2025-07-04 09:32:21 +08:00 |
|
cabbage
|
c7cb018ca1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 09:27:38 +08:00 |
|
cabbage
|
45cca20ff6
|
## 重消订单上传业绩处理（226）；
|
2025-07-04 09:27:22 +08:00 |
|
sangelxiu1
|
c274fba09e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-04 09:26:16 +08:00 |
|
sangelxiu1
|
6b4256bf1e
|
## Opt - 选择区域业绩取值替换(ALL_)
|
2025-07-04 09:26:10 +08:00 |
|
cabbage
|
75f4633805
|
## 区域月度考核数据处理；
|
2025-07-03 17:41:53 +08:00 |
|
cabbage
|
7a9e91e218
|
## 日结初始化，处理新増字段；
|
2025-07-03 15:34:32 +08:00 |
|
cabbage
|
91a474d8a7
|
## 商品指定某个会员可见；
|
2025-07-03 13:43:46 +08:00 |
|
cabbage
|
3965ed4116
|
## 复购订单区域分红按业绩处理；
|
2025-07-03 13:25:09 +08:00 |
|
cabbage
|
577ca4a353
|
## 复购订单区域分红按业绩处理；
|
2025-07-03 11:12:19 +08:00 |
|
cabbage
|
53c5083696
|
## 复购订单区域分红按业绩处理；
|
2025-07-03 10:32:47 +08:00 |
|
cabbage
|
d66b56ab02
|
## 兼容oracle字段为空处理成0；
|
2025-07-03 10:06:01 +08:00 |
|
cabbage
|
297dc5fb6c
|
## 调整日结盒数字段长度；
|
2025-07-03 09:53:23 +08:00 |
|
cabbage
|
6a7fac1799
|
## 秒结查询数据语句调整；
|
2025-07-03 09:46:06 +08:00 |
|
cabbage
|
bf6c3198c6
|
## 创建日结表语句调整；
|
2025-07-03 09:06:50 +08:00 |
|
cabbage
|
a2e4fe6f8b
|
## 创建秒结表语句调整；
|
2025-07-03 08:51:16 +08:00 |
|
cabbage
|
5be813550e
|
## 复购区域分红改为支持比率+比值；
|
2025-07-02 18:08:33 +08:00 |
|
cabbage
|
97aa32d3a0
|
## 复购添加区域分红方式；
|
2025-07-02 16:46:42 +08:00 |
|
cabbage
|
6f4ed94aab
|
## 复购添加区域分红方式；
|
2025-07-02 15:49:40 +08:00 |
|
cabbage
|
a92c0c1946
|
## 使用新字段处理分红奖衔；
|
2025-07-02 15:35:51 +08:00 |
|
cabbage
|
1dde630c1c
|
## 秒结、日结针对未激活会员添加字段累计团队数据，为推荐人处理大小市场处理；
|
2025-07-02 15:19:54 +08:00 |
|
sangelxiu1
|
4c7575f8c5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-07-02 10:12:05 +08:00 |
|
sangelxiu1
|
aa282c7cde
|
## Opt - 秒结盒数&业绩取值替换(ALL_)
|
2025-07-02 10:12:00 +08:00 |
|
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 |
|
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
|
5b231b923d
|
feat(BdRegionVertexServiceImpl): 添加区域分组判断逻辑修复
|
2025-06-25 17:47:10 +08:00 |
|
cabbage
|
03416320f4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 16:54:43 +08:00 |
|
cabbage
|
e7430e1bb9
|
## 复购级差收益处理修改；
|
2025-06-25 16:54:39 +08:00 |
|
sangelxiu1
|
abfa5b5968
|
## Feat - 添加&修改体系,增加分组ID
|
2025-06-25 16:54:07 +08:00 |
|
sangelxiu1
|
92c6f102e1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 16:49:45 +08:00 |
|
sangelxiu1
|
0771c26a6d
|
## Feat - 增加获取全部区域体系分组配置列表&体系列表增加绑定区域名称
|
2025-06-25 16:49:39 +08:00 |
|
cabbage
|
7259fd7bd2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 16:41:48 +08:00 |
|
cabbage
|
3a52c2bc27
|
## 赠送等级之后可以继续购买升级；
|
2025-06-25 16:41:44 +08:00 |
|
sangelxiu1
|
8138657903
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-06-25 16:30:01 +08:00 |
|
sangelxiu1
|
4d14e33ea9
|
## Feat - 区域体系分组配置
|
2025-06-25 16:29:40 +08:00 |
|
cabbage
|
a90d130371
|
## 去掉结算中关于奖衔相关处理；
|
2025-06-25 16:21:37 +08:00 |
|
cabbage
|
6d19e27afb
|
## 赠送等级之后可以继续购买升级；
|
2025-06-25 16:21:00 +08:00 |
|
cabbage
|
e6a54d5b23
|
## 会员奖金明细福利分红返回字段调整；
|
2025-06-25 14:34:01 +08:00 |
|
cabbage
|
6b20e56630
|
## 去掉奖金查询不需要的方法；
|
2025-06-25 14:19:58 +08:00 |