From de79efda9a39a62dd03ce8840d541cc1e9c2939e Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 4 Jun 2025 17:35:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=EF=BC=88?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=94=A8=E6=88=B7=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=9A=84=E6=8A=BD?= =?UTF-8?q?=E4=BD=A3=E6=AF=94=E4=BE=8B=EF=BC=89=EF=BC=8C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=BB=E8=A6=81=E4=BF=A1=E6=81=AF=E8=A1=A8=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5uniteRate=EF=BC=88?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=8A=BD=E4=BD=A3=E6=AF=94=E4=BE=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectCommissionController.java | 26 +++++++------------ .../userInfo/impl/UserInfoServiceImpl.java | 7 +++-- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java index 4c7f3d2..da49640 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java @@ -1,6 +1,7 @@ package com.greenorange.promotion.controller.project; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.greenorange.promotion.annotation.RequiresPermission; import com.greenorange.promotion.annotation.SysLog; @@ -24,6 +25,7 @@ import com.greenorange.promotion.service.project.ProjectDetailService; import com.greenorange.promotion.service.project.ProjectService; import com.greenorange.promotion.service.project.SubUserProjectCommissionService; import com.greenorange.promotion.service.userInfo.UserInfoService; +import com.greenorange.promotion.service.userInfo.UserMainInfoService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -69,25 +71,10 @@ public class ProjectCommissionController { private UserInfoService userInfoService; @Resource - private RedisTemplate redisTemplate; - - - private static final String SUB_USER_COMMISSION_RATE = "subUserCommissionRate"; + private UserMainInfoService userMainInfoService; - /** - * 小程序用户查看下级用户统一的抽佣比例 - * @return 是否添加成功 - */ - @PostMapping("get/redis/Rate") - @Operation(summary = "小程序用户查看下级用户统一的抽佣比例", description = "参数：用户id，权限：用户，方法名：querySubUserUnitCommissionRate") - @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - public BaseResponse querySubUserUnitCommissionRate(HttpServletRequest request) { - Long userId = (Long) request.getAttribute("userId"); - String rate = redisTemplate.opsForValue().get(SUB_USER_COMMISSION_RATE + ":" + userId); - return ResultUtils.success(rate); - } /** @@ -298,7 +285,12 @@ public class ProjectCommissionController { public BaseResponse uniteProjectCommissionRate(@Valid @RequestBody ProjectCommissionUniteUpdateRequest projectCommissionUniteUpdateRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); BigDecimal uniteCommissionRate = projectCommissionUniteUpdateRequest.getUniteCommissionRate(); - redisTemplate.opsForValue().set(SUB_USER_COMMISSION_RATE + ":" + userId, uniteCommissionRate.setScale(2, RoundingMode.HALF_UP).toString()); // 保留两位小数 + + // 修改项目的统一抽佣比例 + LambdaUpdateWrapper userMainInfoLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + userMainInfoLambdaUpdateWrapper.eq(UserMainInfo::getUserId, userId).set(UserMainInfo::getUniteRate, uniteCommissionRate); + userMainInfoService.update(userMainInfoLambdaUpdateWrapper); + LambdaQueryWrapper projectCommissionLambdaQueryWrapper = new LambdaQueryWrapper<>(); projectCommissionLambdaQueryWrapper.eq(ProjectCommission::getUserId, userId); List projectCommissionList = projectCommissionService.list(projectCommissionLambdaQueryWrapper); diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java index e40846d..19ee7fc 100644 --- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java @@ -73,17 +73,19 @@ public class UserInfoServiceImpl extends ServiceImpl @Resource private WechatGetQrcodeService wechatGetQrcodeService; + @Resource private ProjectCommissionService projectCommissionService; + @Resource private SubUserProjectCommissionService subUserProjectCommissionService; + @Resource private UserInfoMapper userInfoMapper; - private static final String SUB_USER_COMMISSION_RATE = "subUserCommissionRate"; /** @@ -173,9 +175,6 @@ public class UserInfoServiceImpl extends ServiceImpl } userMainInfoService.updateBatchById(userMainInfoList); - // 为当前用户添加一个下级统一抽佣比例 - redisTemplate.opsForValue().set(SUB_USER_COMMISSION_RATE + ":" + myUserInfo.getId(), BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP).toString()); // 保留两位小数 - // 生成邀请二维码 try { String view = wechatGetQrcodeService.getWxQrCode(myUserInfo.getInvitationCode());