Commit Graph

924 Commits

Author SHA1 Message Date
woody 4c09f65e57 feat(RetailMemberVO): 会员信息页导出移除收益区域字段,注册业绩移除货币符号 2025-09-30 13:27:51 +08:00
cabbage ceadd71b51 ## 奖衔升级处理方式优化; 2025-09-30 13:27:49 +08:00
zhangheng ea80a5cac5 ## 订单开票枚举替换 2025-09-30 10:55:38 +08:00
zhangheng 1174abd26a ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 10:39:40 +08:00
zhangheng 9ea951c736 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:44:33 +08:00
zhangheng 5f4a6b8698 ## bug425 物流管理菜单下订单类型转枚举 2025-09-30 09:43:26 +08:00
cabbage a4e8f8f8c6 ## 奖衔计算方式改为先算奖衔;赠点排点方式问题修复; 2025-09-29 18:02:25 +08:00
sangelxiu1 6e92c3025b Merge remote-tracking branch 'origin/test' into test 2025-09-29 15:22:37 +08:00
sangelxiu1 aee06c0ef7 ## Opt - 手机端奖金明细 2025-09-29 15:22:31 +08:00
zhangheng 3f2b414337 ## bug427 会员信息查询空数据返回成功 2025-09-29 15:22:17 +08:00
sangelxiu1 a3aee14a0e ## Opt - 手机端奖金明细 2025-09-29 15:18:17 +08:00
cabbage 15dba62617 ## 赠送点位处理; 2025-09-29 14:32:55 +08:00
cabbage f388e583f1 ## 去掉原来不需要MQ推送;奖金明细、奖金来源; 2025-09-29 14:32:54 +08:00
sangelxiu1 06a9ada5a6 ## Opt - 五折专区 2025-09-29 13:59:11 +08:00
cabbage 27fcffa5ca ## 奖衔升级处理; 2025-09-29 13:46:55 +08:00
cabbage 2d683d0a58 ## 调整奖金入库; 2025-09-29 13:46:54 +08:00
cabbage c2dce5274c ## 奖衔计算,直推会员判断大小区使用团队业绩+个人业绩; 2025-09-29 11:33:58 +08:00
sangelxiu1 b1c1ec9074 ## Opt - 业绩统计细化 2025-09-29 11:08:40 +08:00
sangelxiu1 1a477878c9 Merge remote-tracking branch 'origin/test' into test 2025-09-29 11:00:53 +08:00
sangelxiu1 ddf974e33c ## Opt - 业绩统计细化 2025-09-29 11:00:45 +08:00
cabbage 883be1c8a7 ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:55:00 +08:00
cabbage 3e7c57c2a0 ## 奖金来源添加领导奖、平级奖筛选; 2025-09-29 10:55:00 +08:00
cabbage f5584a64c7 ## 领导奖、平级奖计算; 2025-09-29 10:15:18 +08:00
sangelxiu1 a1e7a85fc5 ## Opt - 商品详情,42强转41 2025-09-29 09:53:22 +08:00
sangelxiu1 878cbbe65d ## Fix - 甄选专区的订单撤单失败[http://47.94.148.201:8081/index.php?m=bug&f=view&bugID=423] 2025-09-29 09:41:02 +08:00
zhangheng 7f6ac2347a ## bug421 查询表名修改,查询错误返回错误信息 2025-09-29 09:26:16 +08:00
zhangheng c21f641973 ## bug421 查询表名修改 2025-09-29 09:08:57 +08:00
cabbage 4ec7863084 ## 领导奖、平级奖计算; 2025-09-28 18:03:47 +08:00
zhangheng a2a828d71a ## 阶段配置考核奖衔返回值修改 2025-09-28 17:53:31 +08:00
zhangheng 6ded77fea8 ## 架构修改,阶段配置修改,子节点排序,会员子节点添加未完成数量 2025-09-28 17:24:35 +08:00
cabbage 0378dd3d50 ## 日结奖衔计算处理; 2025-09-28 15:52:10 +08:00
sangelxiu1 5ca7df77ee ## Opt - 等级翻译 2025-09-28 15:27:34 +08:00
sangelxiu1 50c9fc0a1d ## Opt - 市场动态 2025-09-28 14:11:20 +08:00
cabbage 1fc421a74d ## 奖衔实体调整; 2025-09-28 14:03:34 +08:00
cabbage 6704bace80 ## 奖衔实体调整; 2025-09-28 14:03:34 +08:00
sangelxiu1 6442f2bbfb ## Opt - 市场动态-取消自己虚拟区&取消计算个人业绩 2025-09-28 13:40:40 +08:00
cabbage e5c1287d22 ## 结算新字段兼容; 2025-09-28 11:32:20 +08:00
sangelxiu1 3b5a79806f Merge remote-tracking branch 'origin/test' into test 2025-09-28 11:12:38 +08:00
sangelxiu1 994b670493 ## Opt - 市场动态 2025-09-28 11:12:29 +08:00
zhangheng 7374400936 ## 前台返回提示修改 2025-09-28 10:04:27 +08:00
cabbage f336435346 ## 日结处理业绩; 2025-09-28 09:06:00 +08:00
cabbage e4e58f0253 Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberRetailDetailMapper.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICumemberRetailDetailService.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/ICumemberRetailDetailServiceImpl.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/memberPointVO.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java
#	bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/manage/MemberStructureController.java
#	bd-business/bd-business-member/src/main/resources/mapper/retail/member/CuMemberRetailDetailMapper.xml
2025-09-26 18:03:36 +08:00
cabbage 6db021e8b0 ## 日结处理业绩; 2025-09-26 17:55:40 +08:00
cabbage 1595f11723 Merge remote-tracking branch 'origin/dev' into dev 2025-09-26 17:54:37 +08:00
cabbage bc0f51446f ## 日结处理业绩; 2025-09-26 17:54:28 +08:00
zhangheng f832063a17 ## 导出请求修改 2025-09-26 17:49:09 +08:00
zhangheng e1da81afaa ## 导出请求修改 2025-09-26 17:48:47 +08:00
zhangheng db2d7f365c ## 导出请求值修改 2025-09-26 17:37:56 +08:00
zhangheng 89583fe096 ## 导出请求值修改 2025-09-26 17:37:35 +08:00
zhangheng 611121162b ## bug419 导出接收字段修改 2025-09-26 17:17:42 +08:00