Commit Graph

560 Commits

Author SHA1 Message Date
sangelxiu1 8c0a9af6a1 Merge remote-tracking branch 'origin/dev' into dev 2025-10-09 16:34:49 +08:00
sangelxiu1 962476f1a8 ## Opt - 移动端市场动态总业绩 2025-10-09 16:34:43 +08:00
cabbage 9aa9ebdd83 ## 个人业绩显示处理; 2025-10-09 16:30:23 +08:00
cabbage de20f9ed65 ## 个人业绩显示处理; 2025-10-09 16:14:20 +08:00
cabbage abbfc85c86 ## 生产环境nacos; 2025-10-09 15:01:44 +08:00
cabbage 6b7ea2ee2e Merge remote-tracking branch 'origin/dev' into dev 2025-10-09 14:52:56 +08:00
cabbage 6c795805a5 ## 生产环境xxl-job; 2025-10-09 14:52:50 +08:00
zhangheng 14c21b6090 ## bug431 业绩汇总汇总页调整 2025-10-09 10:25:32 +08:00
woody 969e8e2958 feat(RetailMemberVO): 会员信息页导出移除收益区域字段,注册业绩移除货币符号 2025-09-30 11:19:01 +08:00
cabbage c6d84ee89c Merge remote-tracking branch 'origin/dev' into dev 2025-09-30 11:15:38 +08:00
cabbage d00a36b698 ## 奖衔升级处理方式优化; 2025-09-30 11:15:31 +08:00
zhangheng 461c25bf42 ## 订单开票枚举替换 2025-09-30 10:55:25 +08:00
zhangheng 4f168e9a14 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 10:39:02 +08:00
zhangheng 715f7ed3dc ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:44:20 +08:00
zhangheng 5b169701a0 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:43:04 +08:00
cabbage 83136f1387 ## 奖衔计算方式改为先算奖衔;赠点排点方式问题修复; 2025-09-29 18:01:35 +08:00
sangelxiu1 8b5d7a5f9d ## Opt - 手机端奖金明细 2025-09-29 15:23:02 +08:00
zhangheng 5d1ddc2abc ## bug427 会员信息查询空数据返回成功 2025-09-29 15:21:47 +08:00
sangelxiu1 5ad816c449 ## Opt - 手机端奖金明细 2025-09-29 15:17:57 +08:00
cabbage 9cd8bc45f5 ## 赠送点位处理; 2025-09-29 14:31:14 +08:00
cabbage eb1c954894 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 14:02:33 +08:00
cabbage d9ab4c8346 ## 去掉原来不需要MQ推送;奖金明细、奖金来源; 2025-09-29 14:02:29 +08:00
sangelxiu1 793429a502 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 13:58:52 +08:00
sangelxiu1 c11c8be339 ## Opt - 五折专区 2025-09-29 13:58:45 +08:00
cabbage ad42a04afa ## 奖衔升级处理; 2025-09-29 13:46:36 +08:00
cabbage 65f23cae4c ## 调整奖金入库; 2025-09-29 12:00:09 +08:00
cabbage d197689a19 ## 奖衔计算,直推会员判断大小区使用团队业绩+个人业绩; 2025-09-29 11:33:20 +08:00
sangelxiu1 1e6cc04057 ## Opt - 业绩统计细化 2025-09-29 11:08:26 +08:00
sangelxiu1 7e23a37798 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 11:01:34 +08:00
sangelxiu1 866b52a99a ## Opt - 业绩统计细化 2025-09-29 11:01:25 +08:00
cabbage d74ccdb898 ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:54:44 +08:00
cabbage c9da1f307c ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:27:14 +08:00
cabbage 158751fc38 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 10:15:00 +08:00
cabbage 6ff4fd3c1a ## 领导奖、平级奖计算; 2025-09-29 10:14:48 +08:00
sangelxiu1 0797ca19c7 ## Opt - 商品详情,42强转41 2025-09-29 09:46:30 +08:00
sangelxiu1 b1e6f3cc53 Merge remote-tracking branch 'origin/dev' into dev 2025-09-29 09:40:00 +08:00
sangelxiu1 6e730f5da1 ## Fix - 甄选专区的订单撤单失败[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=423] 2025-09-29 09:39:53 +08:00
zhangheng 072ba08f67 ## bug421 查询表名修改,查询错误返回错误信息 2025-09-29 09:26:02 +08:00
zhangheng 408aa89cc2 ## bug421 查询表名修改 2025-09-29 09:08:21 +08:00
cabbage cf973fd5b9 ## 领导奖、平级奖计算; 2025-09-28 18:03:21 +08:00
zhangheng cd4a09d35d ## 阶段配置考核奖衔返回值修改 2025-09-28 17:53:07 +08:00
zhangheng 5e0fecd8b9 ## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量 2025-09-28 17:23:54 +08:00
cabbage 290793236a ## 日结奖衔计算处理; 2025-09-28 15:51:45 +08:00
sangelxiu1 3626b3f4cc ## Opt - 等级翻译 2025-09-28 15:27:23 +08:00
cabbage 5c8c950931 ## 奖衔实体调整; 2025-09-28 13:59:49 +08:00
cabbage 75d68a34d8 ## 奖衔实体调整; 2025-09-28 13:59:17 +08:00
sangelxiu1 d60a2f2be4 ## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩 2025-09-28 13:40:07 +08:00
sangelxiu1 975665c548 Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 12:22:59 +08:00
sangelxiu1 215106c4ac ## Opt - 市场动态 2025-09-28 12:22:51 +08:00
cabbage 4c27a9f9f1 Merge remote-tracking branch 'origin/dev' into dev 2025-09-28 11:31:36 +08:00