Commit Graph

191 Commits

Author SHA1 Message Date
zhangheng a2d976e10a Merge remote-tracking branch 'origin/dev' into dev 2025-09-18 15:07:37 +08:00
zhangheng 2a08a20497 ## 推荐列表添加注册业绩、团队人数 2025-09-18 15:07:24 +08:00
cabbage 900129db57 ## 精品专区直推收益;商城专区见点收益;商品基础规格等配置去掉缓存;去掉部分不需要代码和枚举; 2025-09-18 14:18:20 +08:00
cabbage 3a2f7c4f26 ## 去掉重复字段; 2025-09-17 14:21:29 +08:00
cabbage 158c5e8a9b ## 每天创建结算明细表; 2025-09-17 13:49:51 +08:00
cabbage d71c8ef105 ## 提现走绑定银行卡逻辑;银行卡添加4要素认证; 2025-09-17 12:00:09 +08:00
cabbage 903d21f4b7 ## 迁移补全功能; 2025-09-17 11:36:39 +08:00
cabbage bfc0c9dcc6 Merge remote-tracking branch 'origin/dev' into dev 2025-09-17 11:30:43 +08:00
cabbage c0548c8aa4 ## 转账、提现添加账户金额是否足够校验; 2025-09-17 11:30:38 +08:00
sangelxiu1 8b52bbb00f Merge remote-tracking branch 'origin/dev' into dev 2025-09-16 17:07:27 +08:00
sangelxiu1 5c2b8e6562 ## Opt - 迁移分享注册流程 2025-09-16 17:07:19 +08:00
cabbage 188b733d80 Merge remote-tracking branch 'origin/dev' into dev 2025-09-09 17:24:10 +08:00
cabbage d0a36691ec ## 去掉原复购级差;添加会员日结明细; 2025-09-09 17:24:01 +08:00
zhangheng 24967d0b8b ## 调换货物和业绩汇总导出最新代码 2025-09-09 17:00:12 +08:00
sangelxiu1 aba66a444c Merge remote-tracking branch 'origin/dev' into dev 2025-09-09 15:45:54 +08:00
sangelxiu1 19cbc5c766 ## Opt - 新秒结表 2025-09-09 15:45:30 +08:00
cabbage 10fbf97186 ## 系统名称; 2025-09-09 15:42:09 +08:00
cabbage fc10c0ca6d ## 等级只保留会员一个等级; 2025-09-09 15:02:29 +08:00
cabbage 556cfd486c ## 去掉对碰、辅导、区域相关奖项处理;去掉结算中等级处理;去掉区域等考核处理; 2025-09-09 14:33:14 +08:00
cabbage 80f5d8db12 ## 去掉升级相关逻辑; 2025-09-09 11:32:20 +08:00
cabbage ace7a99fa2 ## 去掉盒数相关; 2025-09-08 16:35:37 +08:00
cabbage db4e2b270c ## 去除部分国际化;去掉自动提现等; 2025-08-19 14:14:40 +08:00
cabbage 98cec09009 ## 去除国际化异步处理; 2025-08-19 11:53:04 +08:00
cabbage 86f29b3278 ## 调整去除部分不需要内容; 2025-08-19 11:00:11 +08:00
cabbage 85b0b7cd21 ## 调整系统名称; 2025-08-18 11:28:56 +08:00
woody 4a986bec3a feat(SaOrderSync): 全网商品管理-同步失败订单列表 2025-08-13 18:09:49 +08:00
cabbage bd3b761529 ## 产品库存同步实体添加SEQ; 2025-08-13 11:26:22 +08:00
cabbage be25ded559 ## 实名更新生日;调整部分国际化; 2025-08-12 18:20:04 +08:00
cabbage b25411fe8a ## 同步产品库存失败添加日志; 2025-08-12 15:57:08 +08:00
cabbage e653baee75 ## 去掉原进存相关逻辑; 2025-08-12 14:58:14 +08:00
cabbage 4660893952 ## 全网产品库存同步; 2025-08-12 14:48:26 +08:00
cabbage 0c81b997bc ## 未合单添加非在售商品处理; 2025-08-12 14:45:24 +08:00
cabbage cfaf62cadd ## 短信改为用会员ID做校验;实名认证迁移; 2025-08-12 14:02:27 +08:00
cabbage 23253474f1 ## 去掉旧短信相关内容; 2025-08-07 16:28:07 +08:00
sangelxiu1 c05a75bbac ## Opt - systemType 默认从枚举取值 2025-08-01 16:57:36 +08:00
sangelxiu1 891e2e52d6 ## Opt - systemType 默认2 2025-08-01 16:57:02 +08:00
cabbage f879199b25 Merge remote-tracking branch 'origin/dev' into dev 2025-08-01 13:22:54 +08:00
cabbage 337cd41e61 ## 提取雨汐团队写死配置; 2025-08-01 13:22:47 +08:00
sangelxiu1 3f4afdc3b2 ## Feat - 体系banner 2025-08-01 09:10:47 +08:00
cabbage 4c21071b6a ## 业绩汇总接口; 2025-07-18 15:20:00 +08:00
cabbage b8ad546dea ## 上传盒数商品添加商品编码; 2025-07-18 14:36:07 +08:00
cabbage dc977087f9 ## 迁移总裁面板相关接口; 2025-07-18 14:27:25 +08:00
sangelxiu1 f22246a05c ## Feat - 在线支付明细增加订单类型 2025-07-15 15:10:39 +08:00
sangelxiu1 d47a5f6b37 ## Feat - 在线支付明细增加订单类型 2025-07-15 15:05:50 +08:00
cabbage 4eec5d0fd6 ## 直推收益改为商品价格10%; 2025-07-15 09:09:44 +08:00
sangelxiu1 56fcda4854 ## Feat - 体系分享图&支付回调增加支付通道流水号 2025-07-14 14:14:03 +08:00
sangelxiu1 24e207c89d ## Feat - 后台列表增加分账金额 2025-07-11 10:13:46 +08:00
cabbage 7376415d2f ## 商品列表添加权限控制; 2025-07-10 14:29:19 +08:00
cabbage d8df6a047d ## 新复购级差枚举值转换处理; 2025-07-10 10:51:07 +08:00
cabbage 1384c3ecd7 ## 商品盒数中间表支持小数盒数; 2025-07-10 10:06:45 +08:00
cabbage 340c542657 ## 添加体系奖项配置; 2025-07-10 09:45:32 +08:00
cabbage 192be3ff98 ## 复购级差会员显示字段权限调整; 2025-07-09 14:47:30 +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 dabf858e2b ## 添加新零售计算盒数商品; 2025-07-04 11:03:14 +08:00
cabbage 75f4633805 ## 区域月度考核数据处理; 2025-07-03 17:41:53 +08:00
cabbage 91a474d8a7 ## 商品指定某个会员可见; 2025-07-03 13:43:46 +08:00
cabbage 577ca4a353 ## 复购订单区域分红按业绩处理; 2025-07-03 11:12:19 +08:00
cabbage 53c5083696 ## 复购订单区域分红按业绩处理; 2025-07-03 10:32:47 +08:00
cabbage 97aa32d3a0 ## 复购添加区域分红方式; 2025-07-02 16:46:42 +08:00
cabbage 6f4ed94aab ## 复购添加区域分红方式; 2025-07-02 15:49:40 +08:00
cabbage 1dde630c1c ## 秒结、日结针对未激活会员添加字段累计团队数据,为推荐人处理大小市场处理; 2025-07-02 15:19:54 +08:00
cabbage 1d032293ce ## 秒结添加4个累计字段; 2025-07-02 10:02:23 +08:00
cabbage c8291be5ca ## 区域分红支持分组处理; 2025-07-01 15:53:53 +08:00
cabbage f887de2082 ## 每月区域考核数据生成; 2025-07-01 14:53:45 +08:00
cabbage 908c72fdd7 ## 结算查询订单返回商品盒数字段调整; 2025-07-01 11:51:01 +08:00
cabbage 99a8b74ec0 ## 商品盒数支持小数处理; 2025-07-01 09:32:40 +08:00
sangelxiu1 7766c46086 ## Opt - 盒数小数 2025-06-30 16:35:22 +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 c48916fd6e ## Feat - 选择区域增加小区10W验证&按体系分组绑定区域 2025-06-30 10:27:44 +08:00
cabbage 9dd7d099d5 ## 奖金来源、奖金汇总、奖金明细添加培训津贴返回以及导出; 2025-06-27 11:40:34 +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
sangelxiu1 abfa5b5968 ## Feat - 添加&修改体系,增加分组ID 2025-06-25 16:54:07 +08:00
sangelxiu1 4d14e33ea9 ## Feat - 区域体系分组配置 2025-06-25 16:29:40 +08:00
cabbage e6a54d5b23 ## 会员奖金明细福利分红返回字段调整; 2025-06-25 14:34:01 +08:00
cabbage b4af4adb72 ## 奖金来源、奖金明细显示以及导出调整; 2025-06-25 13:50:27 +08:00
cabbage a3c8957025 ## 复购级差收益累计以及备注调整; 2025-06-25 11:34:16 +08:00
cabbage 3c0f8cfc97 ## 前台会员明细返回; 2025-06-23 17:58:51 +08:00
cabbage a4c4a7c135 ## 奖金明细、奖金来源新奖金字段; 2025-06-23 17:49:19 +08:00
cabbage 967e0e851d ## 月度分红处理; 2025-06-23 16:43:49 +08:00
cabbage 2731274f58 ## 月奖月度级差、复购级差; 2025-06-23 11:58:10 +08:00
sangelxiu1 01d77cdf10 Merge remote-tracking branch 'origin/dev' into dev 2025-06-19 17:35:29 +08:00
sangelxiu1 0bceaa15d8 ## Opt - PageUtils.clearPage AOP 2025-06-19 17:35:23 +08:00
cabbage a35e468103 ## 秒结、日结恢复分红奖衔; 2025-06-19 15:30:23 +08:00
cabbage 164a336558 ## 替换国际化处理; 2025-06-18 16:46:04 +08:00
cabbage bdc00adc9e ## 指定新零售在线支付测试账号; 2025-06-18 15:27:06 +08:00
cabbage 550225fb15 ## 调整会员、订单前缀; 2025-06-18 10:33:42 +08:00
cabbage 3c679ce8a8 ## 推荐正反查调整处理方式; 2025-06-17 17:28:17 +08:00
cabbage f79e4a7ab6 ## 真实奖衔分析、等级升级查询; 2025-06-17 16:57:14 +08:00
cabbage 45e3ec095c ## 去掉旧抗衰达人,调整推荐相关列表; 2025-06-17 16:03:53 +08:00
cabbage e89e09371f ## 等级修改、0元注册、删除空点相关接口调整; 2025-06-17 15:43:29 +08:00
cabbage 34b1b8632a ## 日结添加团队月盒数字段及处理;月奖查询订单不走dubbo服务,改为自查询; 2025-06-17 10:46:35 +08:00