Commit Graph

409 Commits

Author SHA1 Message Date
cabbage 91e24047b2 ## 复购添加区域分红方式; 2025-07-02 18:12:24 +08:00
cabbage 0c5d073614 ## 使用新字段处理分红奖衔; 2025-07-02 18:12:24 +08:00
cabbage 4e4452365f ## 秒结、日结针对未激活会员添加字段累计团队数据,为推荐人处理大小市场处理; 2025-07-02 18:12:23 +08:00
cabbage ce36d07ddc ## 秒结添加4个累计字段; 2025-07-02 18:12:21 +08:00
cabbage 3d91bf5429 ## 秒结添加4个累计字段; 2025-07-02 18:12:20 +08:00
sangelxiu1 dd2b062355 ## Opt - 秒结盒数&业绩取值替换(ALL_) 2025-07-02 10:12:52 +08:00
sangelxiu1 e769429a34 ## Fix - H5体系-区域选择 2025-07-02 10:12:49 +08:00
cabbage cefd1b164e ## 复购商品都有区域分红;区域分红处理时,汇率为空解决; 2025-07-01 18:50:26 +08:00
cabbage 8265dc92e3 ## 如果是非合数商品调换货物,商品ID清0处理; 2025-07-01 18:50:25 +08:00
cabbage 67007abc7a ## 查询区域分组ID返回字段调整; 2025-07-01 17:25:16 +08:00
cabbage 2ca27c894c ## 撤单盒数处理修改; 2025-07-01 16:19:22 +08:00
cabbage 69c5a8a0bf ## 空单会员升级订单报错处理; 2025-07-01 16:19:12 +08:00
cabbage 5ddf4208ec ## 区域分红支持分组处理; 2025-07-01 16:19:02 +08:00
cabbage 4cfca176bb ## 每月区域考核数据生成; 2025-07-01 16:18:58 +08:00
sangelxiu1 4ff7004909 ## Fix - H5体系-区域选择 2025-07-01 15:21:27 +08:00
cabbage 561b61a30b ## 下单计算等级查询盒数支持小数处理; 2025-07-01 14:35:25 +08:00
sangelxiu1 3d9d5df921 ## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境,BF28195798这个会员伞下一个人都没有,他市场动态下面无数个人[215] 2025-07-01 14:24:10 +08:00
sangelxiu1 99033b66cd ## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境,BF28195798这个会员伞下一个人都没有,他市场动态下面无数个人[215] 2025-07-01 14:17:53 +08:00
cabbage 66c36c5262 ## 结算查询订单返回商品盒数字段调整; 2025-07-01 11:51:47 +08:00
sangelxiu1 8b56a4bd47 ## Fix - npe 2025-07-01 11:51:47 +08:00
cabbage e53c2d6567 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/vo/MemberBonusFirstPurchaseVO.java
#	bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
#	bd-business/bd-business-system/src/main/java/com/hzs/system/base/service/impl/BdRegionVertexServiceImpl.java
2025-07-01 09:36:22 +08:00
sangelxiu1 e196534b4d ## Opt - 补充继承基类的sql 2025-07-01 09:33:14 +08:00
cabbage 99a8b74ec0 ## 商品盒数支持小数处理; 2025-07-01 09:32:40 +08:00
sangelxiu1 7766c46086 ## Opt - 盒数小数 2025-06-30 16:35:22 +08:00
sangelxiu1 cc187e45bf ## Opt - 区域体系增加查询条件 2025-06-30 14:33:56 +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 8e9cb6ba74 ## Opt - 区域体系增加查询条件 2025-06-30 14:16:31 +08:00
sangelxiu1 72ca3e6a34 ## Feat - 选择区域增加小区10W验证&按体系分组绑定区域 2025-06-30 14:16:28 +08:00
sangelxiu1 b9b4189f96 ## Feat - 添加&修改体系,增加分组ID 2025-06-30 14:15:49 +08:00
sangelxiu1 7c06293776 ## Feat - 增加获取全部区域体系分组配置列表&体系列表增加绑定区域名称 2025-06-30 14:15:46 +08:00
sangelxiu1 bb9bd5b7d4 ## Feat - 区域体系分组配置 2025-06-30 14:15:42 +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 eabe4f2efc ## 奖衔配置调整;去掉4-N配置等; 2025-06-30 13:38:50 +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 49e4d71418 ## 月度分红处理时,不激活的不计算奖金; 2025-06-30 09:27:52 +08:00
cabbage 040a1eec14 ## 月度分红处理时,不激活的不计算奖金; 2025-06-30 09:24:58 +08:00
sangelxiu1 26106f788c ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-06-27 11:48:25 +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 d574b937b5 ## 会员实时奖金返回培育津贴字段; 2025-06-27 11:45:10 +08:00
sangelxiu1 5ef63e5d17 ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-06-27 11:45:09 +08:00
cabbage caf6cbe158 ## 奖金来源、奖金汇总、奖金明细添加培训津贴返回以及导出; 2025-06-27 11:45:08 +08:00
sangelxiu1 b64f1100b9 ## Feat - 清理数据Job (del_flag = 1 & 30天 awards/level/grade) 2025-06-27 11:45:05 +08:00
cabbage ca7a6821b3 ## 日结处理荣誉奖衔; 2025-06-27 11:44:59 +08:00