diff --git a/blank.png b/blank.png deleted file mode 100644 index b71b21c..0000000 Binary files a/blank.png and /dev/null differ diff --git a/qrcode.png b/qrcode.png deleted file mode 100644 index 8d7a4cd..0000000 Binary files a/qrcode.png and /dev/null differ 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 6b27b91..e1fb3f2 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.toolkit.support.SFunction; import com.greenorange.promotion.annotation.RequiresPermission; import com.greenorange.promotion.annotation.SysLog; import com.greenorange.promotion.common.BaseResponse; @@ -79,10 +80,7 @@ public class ProjectCommissionController { // @SysLog(title = "项目明细抽佣管理", content = "小程序用户查看查询项目的抽佣情况") public BaseResponse> queryProjectCommission(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProjectCommission::getUserId, userId); - List projectCommissionList = projectCommissionService.list(lambdaQueryWrapper); - + List projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, userId, projectCommissionService); List projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId); // 封装Map集合(键:项目明细id,值:项目明细名称) Map projectDetailMap = new HashMap<>(); @@ -155,10 +153,8 @@ public class ProjectCommissionController { // 批量更新下级用户的项目明细抽佣比例 Long userId = (Long) request.getAttribute("userId"); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SubUserProjectCommission::getProjectDetailId, projectDetailId); - lambdaQueryWrapper.eq(SubUserProjectCommission::getUserId, userId); - List subUserProjectCommissionList = subUserProjectCommissionService.list(lambdaQueryWrapper); + Map, Object> fieldConditions = Map.of(SubUserProjectCommission::getProjectDetailId, projectDetailId, SubUserProjectCommission::getUserId, userId); + List subUserProjectCommissionList = commonService.findByFieldEqTargetFields(fieldConditions, subUserProjectCommissionService); for (SubUserProjectCommission subUserProjectCommission : subUserProjectCommissionList) { subUserProjectCommission.setCurrentCommissionRate(currentCommissionRate); } 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 a67323d..2cc550a 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 @@ -277,11 +277,11 @@ public class UserInfoServiceImpl extends ServiceImpl public String getVerificationCode(String phoneNumber) { ThrowUtils.throwIf(RegexUtils.isPhoneInvalid(phoneNumber), ErrorCode.PARAMS_ERROR, "手机号格式错误"); - // 判断手机号是否已注册 - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(UserInfo::getPhoneNumber, phoneNumber); - UserInfo userInfo = this.getOne(lambdaQueryWrapper); - ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "手机号未注册"); +// // 判断手机号是否已注册 +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.eq(UserInfo::getPhoneNumber, phoneNumber); +// UserInfo userInfo = this.getOne(lambdaQueryWrapper); +// ThrowUtils.throwIf(userInfo == null, ErrorCode.OPERATION_ERROR, "手机号未注册"); String verificationCode = SendSmsUtil.getVerificationCode(phoneNumber); ThrowUtils.throwIf(verificationCode == null, ErrorCode.OPERATION_ERROR, "验证码获取失败");