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 da37db1..06542e7 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java @@ -85,7 +85,8 @@ public class ProjectCommissionController { public BaseResponse> queryProjectCommission(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); List projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, userId, projectCommissionService); - List projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId); + List projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId, + List.of(ProjectDetail::getId, ProjectDetail::getProjectDetailName, ProjectDetail::getMaxCommissionRate)); // 封装Map集合(键:项目明细id,值:项目明细名称) Map projectDetailMap = new HashMap<>(); // 封装Map集合(键:项目明细id,值:项目明细最大抽佣比例) @@ -213,7 +214,8 @@ public class ProjectCommissionController { lambdaQueryWrapper.eq(SubUserProjectCommission::getUserId, userId); List subUserProjectCommissionList = subUserProjectCommissionService.list(lambdaQueryWrapper); - List projectDetailList = commonService.findByFieldInTargetField(subUserProjectCommissionList, projectDetailService, SubUserProjectCommission::getProjectDetailId, ProjectDetail::getId); + List projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(subUserProjectCommissionList, projectDetailService, SubUserProjectCommission::getProjectDetailId, ProjectDetail::getId, + List.of(ProjectDetail::getId, ProjectDetail::getProjectDetailName, ProjectDetail::getMaxCommissionRate)); // 封装Map集合(键:项目明细id,值:项目明细名称) Map projectDetailMap = new HashMap<>(); // 封装Map集合(键:项目明细id,值:项目明细最大抽佣比例) @@ -253,6 +255,7 @@ public class ProjectCommissionController { // 封装下级用户项目抽佣列表 LambdaQueryWrapper userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); userInfoLambdaQueryWrapper.eq(UserInfo::getParentUserId, userId); + userInfoLambdaQueryWrapper.select(UserInfo::getId, UserInfo::getNickName); List userInfoList = userInfoService.list(userInfoLambdaQueryWrapper); List subUserProjectCommissionVOList = new ArrayList<>(); for (UserInfo userInfo : userInfoList) { diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java index 5beb102..68d2a69 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java @@ -71,8 +71,10 @@ public class UserMainInfoController { Long userId = (Long) request.getAttribute("userId"); LambdaQueryWrapper userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); userInfoLambdaQueryWrapper.eq(UserInfo::getParentUserId, userId); + userInfoLambdaQueryWrapper.select(UserInfo::getId, UserInfo::getNickName, UserInfo::getPhoneNumber, UserInfo::getCreateTime); List userInfoList = userInfoService.list(userInfoLambdaQueryWrapper); - List userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId); + List userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId, + List.of(UserMainInfo::getUserId, UserMainInfo::getTeamSize, UserMainInfo::getParentEarnings)); // 封装Map集合(键:用户id,值:用户信息) Map userInfoMap = new HashMap<>(); for (UserInfo userInfo : userInfoList) { diff --git a/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java b/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java index 1b547c8..1c93a69 100644 --- a/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/project/impl/ProjectCommissionServiceImpl.java @@ -256,9 +256,11 @@ public class ProjectCommissionServiceImpl extends ServiceImpl projectCommissionLambdaQueryWrapper = new LambdaQueryWrapper<>(); projectCommissionLambdaQueryWrapper.eq(ProjectCommission::getUserId, userId); + projectCommissionLambdaQueryWrapper.select(ProjectCommission::getProjectDetailId); List projectCommissionList = this.list(projectCommissionLambdaQueryWrapper); - List projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId); + List projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId, + List.of(ProjectDetail::getId, ProjectDetail::getMaxCommissionRate, ProjectDetail::getProjectMinSettlementPrice)); // 封装map集合(键:项目明细id, 值:项目明细最大抽佣比例) Map map = new HashMap<>(); Map minPriceMap = new HashMap<>(); @@ -285,6 +287,7 @@ public class ProjectCommissionServiceImpl extends ServiceImpl subUserProjectCommissionLambdaQueryWrapper = new LambdaQueryWrapper<>(); subUserProjectCommissionLambdaQueryWrapper.eq(SubUserProjectCommission::getUserId, userId); + subUserProjectCommissionLambdaQueryWrapper.select(SubUserProjectCommission::getProjectDetailId); List subUserProjectCommissionList = subUserProjectCommissionService.list(subUserProjectCommissionLambdaQueryWrapper); for (SubUserProjectCommission subUserProjectCommission : subUserProjectCommissionList) { Long projectDetailId = subUserProjectCommission.getProjectDetailId(); diff --git a/src/main/java/com/greenorange/promotion/service/project/impl/PromoCodeServiceImpl.java b/src/main/java/com/greenorange/promotion/service/project/impl/PromoCodeServiceImpl.java index cca338b..a936157 100644 --- a/src/main/java/com/greenorange/promotion/service/project/impl/PromoCodeServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/project/impl/PromoCodeServiceImpl.java @@ -30,6 +30,7 @@ public class PromoCodeServiceImpl extends ServiceImpl ids = commonBatchRequest.getIds(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(PromoCode::getId, ids).eq(PromoCode::getPromoCodeStatus, true); + lambdaQueryWrapper.select(PromoCode::getId); List promoCodeList = this.list(lambdaQueryWrapper); ThrowUtils.throwIf(promoCodeList.size() > 0, ErrorCode.OPERATION_ERROR, "当前推广码正在使用中,无法删除"); this.removeByIds(ids);