 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 |