Commit Graph

430 Commits

Author SHA1 Message Date
cabbage 757a574191 ## 秒结兼容多送2级处理问题; 2025-07-04 18:29:31 +08:00
cabbage 96d7e1d213 ## 分红奖衔处理调整; 2025-07-04 14:53:40 +08:00
cabbage 6f928a4dbd ## 撤单秒结盒数、业绩应该扣减; 2025-07-04 11:16:15 +08:00
cabbage f9c40d43c1 ## 添加新零售计算盒数商品; 2025-07-04 11:16:15 +08:00
cabbage 002c178c83 ## 撤单回退盒数业绩处理(227);盒数累计改为直接取订单盒数不再重新计算; 2025-07-04 10:10:16 +08:00
cabbage 49628d3755 ## 重消订单上传业绩处理(226); 2025-07-04 10:10:16 +08:00
sangelxiu1 e86e8a05d7 ## Opt - 盒数&业绩(ALL_) 2025-07-04 09:33:00 +08:00
sangelxiu1 fda785c68c ## Opt - 选择区域业绩取值替换(ALL_) 2025-07-04 09:33:00 +08:00
cabbage bd7d788769 ## 区域月度考核数据处理; 2025-07-03 18:02:38 +08:00
cabbage 82a0459bfe ## 日结初始化,处理新増字段; 2025-07-03 18:02:35 +08:00
cabbage 7efa68ae01 ## 商品指定某个会员可见; 2025-07-03 15:01:01 +08:00
cabbage 13736b4c3c ## 复购订单区域分红按业绩处理; 2025-07-03 13:25:31 +08:00
cabbage da53b0ce35 ## 复购订单区域分红按业绩处理; 2025-07-03 12:00:25 +08:00
cabbage e2af0a6be8 ## 复购订单区域分红按业绩处理; 2025-07-03 10:33:54 +08:00
cabbage 7de4bc6370 ## 兼容oracle字段为空处理成0; 2025-07-03 10:06:24 +08:00
cabbage 77e299e6aa ## 调整日结盒数字段长度; 2025-07-03 10:06:24 +08:00
cabbage 788b26b8fe ## 秒结查询数据语句调整; 2025-07-03 09:46:28 +08:00
cabbage 57f2db85ff ## 创建日结表语句调整; 2025-07-03 09:10:48 +08:00
cabbage be4ec034b3 ## 创建秒结表语句调整; 2025-07-03 08:53:32 +08:00
cabbage 2c292a0ec1 ## 复购区域分红改为支持比率+比值; 2025-07-02 18:12:25 +08:00
cabbage 10bc31dc50 ## 复购添加区域分红方式; 2025-07-02 18:12:24 +08:00
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