Commit Graph

346 Commits

Author SHA1 Message Date
cabbage f2003060bc ## 业绩汇总接口; 2025-07-22 10:37:26 +08:00
cabbage 2da43d2891 ## 业绩汇总接口; 2025-07-22 10:37:25 +08:00
cabbage d0a0bbb335 ## 迁移总裁面板相关接口; 2025-07-22 10:37:24 +08:00
cabbage 471f248e19 ## 奖金拨比统计报错(299); 2025-07-22 10:37:24 +08:00
woody 7e5c94c6e3 feat(MemberBonusFirstPurchaseVo): 奖金明细保留两位小数 2025-07-22 09:39:23 +08:00
sangelxiu1 df263fd05d Merge remote-tracking branch 'origin/test' into test 2025-07-21 09:32:54 +08:00
sangelxiu1 c9578916a3 ## Opt - 商品自定义排序 2025-07-21 09:32:36 +08:00
cabbage e4b7fef2e5 ## 在线支付处理多送两级问题; 2025-07-18 21:26:51 +08:00
cabbage 3afae49d92 ## 在线支付处理升级多送两级问题; 2025-07-18 20:54:57 +08:00
sangelxiu1 15338324bc ## Opt - 盒数&市场动态, 凌晨3天前取-1天 2025-07-18 10:18:35 +08:00
cabbage 3a772ee9d8 ## 撤单重消订单推送秒结处理; 2025-07-15 13:31:44 +08:00
cabbage 4bd21b9950 ## 直推收益改为商品价格10%; 2025-07-15 09:10:52 +08:00
cabbage 840f2b754f ## 雨汐体系V4、V5升级盒数单独处理;
V4:总500,小100;
V5:总2000,小400;
2025-07-15 09:10:52 +08:00
sangelxiu1 f476b3a09a ## Feat - 体系分享图&支付回调增加支付通道流水号 2025-07-14 14:15:23 +08:00
cabbage 9cafc562fa ## 秒结执行延迟1秒; 2025-07-11 09:30:18 +08:00
cabbage b450ebf3a1 ## 商品列表添加权限控制; 2025-07-10 15:23:06 +08:00
cabbage ed0f391eb4 ## 复购级差默认显示4位小数; 2025-07-10 15:23:05 +08:00
cabbage 28c42b4851 ## 商品列表添加权限控制; 2025-07-10 14:29:51 +08:00
cabbage b8e4402b78 ## 新复购级差收益累计商品数量; 2025-07-10 14:29:51 +08:00
cabbage ed49bcf975 ## 新复购级差收益累计商品数量; 2025-07-10 14:29:51 +08:00
cabbage 19bee0f3b2 ## 新复购级差判断类型调整; 2025-07-10 12:02:56 +08:00
cabbage 8b4e309f8a ## 新复购级差枚举值转换处理; 2025-07-10 10:52:45 +08:00
cabbage ea99ec0bb5 ## 商品盒数中间表支持小数盒数; 2025-07-10 10:52:44 +08:00
cabbage 158f26ec9d ## 商品盒数中间表支持小数盒数; 2025-07-10 10:52:44 +08:00
cabbage 18e072c3f2 ## 添加体系奖项配置; 2025-07-10 10:52:41 +08:00
sangelxiu1 7c30dd0041 ## Fix - 支付回调地址&提现驳回返回金额 2025-07-10 09:46:21 +08:00
cabbage d7b0faff60 ## 没有配置会员复购级差权限校验修改; 2025-07-09 15:34:28 +08:00
cabbage 192be3ff98 ## 复购级差会员显示字段权限调整; 2025-07-09 14:47:30 +08:00
sangelxiu1 2f6ce5d97e Merge remote-tracking branch 'origin/dev' into dev 2025-07-09 13:49:42 +08:00
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