diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java index 782f016..fb63b00 100644 --- a/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java +++ b/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java @@ -141,7 +141,10 @@ public class CourseOrderController { Long userId = courseOrder.getUserId(); List pathToRoot = userInfoService.findPathToRoot(userId); List subPathToRoot = pathToRoot.subList(1, 3); - List userPerformanceSummaryList = commonService.findByFieldInTargetField(subPathToRoot, userPerformanceSummaryService, Function.identity(), UserPerformanceSummary::getUserId); + List userPerformanceSummaryList = commonService.findByFieldInTargetFieldWithSpecificFields( + subPathToRoot, userPerformanceSummaryService, Function.identity(), UserPerformanceSummary::getUserId, + List.of(UserPerformanceSummary::getTotalAmount, UserPerformanceSummary::getNetAmount, UserPerformanceSummary::getOrderCount, + UserPerformanceSummary::getToRelease, UserPerformanceSummary::getToSettle)); BigDecimal rate; Map rateMap = userPerformanceSummaryService.queryRakeRewardsRate(); for (int i = 0; i < userPerformanceSummaryList.size(); i ++ ) { @@ -221,7 +224,9 @@ public class CourseOrderController { Long userId = courseOrder.getUserId(); List pathToRoot = userInfoService.findPathToRoot(userId); List superUserIdList = pathToRoot.subList(1, 3); - List userPerformanceSummaryList = commonService.findByFieldInTargetField(superUserIdList, userPerformanceSummaryService, Function.identity(), UserPerformanceSummary::getUserId); + List userPerformanceSummaryList = commonService.findByFieldInTargetFieldWithSpecificFields( + superUserIdList, userPerformanceSummaryService, Function.identity(), UserPerformanceSummary::getUserId, + List.of(UserPerformanceSummary::getTotalAmount, UserPerformanceSummary::getToRelease, UserPerformanceSummary::getRefunded)); BigDecimal rate; LambdaQueryWrapper coursePromotionQueryWrapper = new LambdaQueryWrapper<>(); coursePromotionQueryWrapper.eq(CoursePromotionCommissionPending::getOrderId, courseOrder.getId()); diff --git a/src/main/java/com/greenorange/promotion/controller/course/CoursePromotionCommissionPendingController.java b/src/main/java/com/greenorange/promotion/controller/course/CoursePromotionCommissionPendingController.java index 098b1aa..a1842ae 100644 --- a/src/main/java/com/greenorange/promotion/controller/course/CoursePromotionCommissionPendingController.java +++ b/src/main/java/com/greenorange/promotion/controller/course/CoursePromotionCommissionPendingController.java @@ -43,25 +43,25 @@ import java.math.BigDecimal; import java.util.List; -/** - * 课程推广待提成记录 控制器 - */ -@RestController -@RequestMapping("coursePromo") -@Slf4j -@Tag(name = "课程推广待提成记录模块") -@Transactional -public class CoursePromotionCommissionPendingController { - - @Resource - private CoursePromotionCommissionPendingService coursePromotionCommissionPendingService; - - @Resource - private CommonService commonService; - - @Resource - private UserInfoService userInfoService; - +///** +// * 课程推广待提成记录 控制器 +// */ +//@RestController +//@RequestMapping("coursePromo") +//@Slf4j +//@Tag(name = "课程推广待提成记录模块") +//@Transactional +//public class CoursePromotionCommissionPendingController { +// +// @Resource +// private CoursePromotionCommissionPendingService coursePromotionCommissionPendingService; +// +// @Resource +// private CommonService commonService; +// +// @Resource +// private UserInfoService userInfoService; +// @@ -158,4 +158,4 @@ public class CoursePromotionCommissionPendingController { // voPage.setTotal(page.getTotal()); // return ResultUtils.success(voPage); // } -} \ No newline at end of file +//} \ No newline at end of file diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java index 9fd2b6c..179f94b 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java @@ -79,8 +79,8 @@ public class AdvancementApplyController { .or() .eq(AdvancementApply::getPhone, phone) .and(w -> w.in(AdvancementApply::getReviewStatus, ReviewStatusEnum.APPROVED.getValue(), ReviewStatusEnum.PENDING.getValue())); - List applies = advancementApplyService.list(queryWrapper); - ThrowUtils.throwIf(!applies.isEmpty(), ErrorCode.OPERATION_ERROR, "当前手机号或身份证号已申请过"); + long count = advancementApplyService.count(queryWrapper); + ThrowUtils.throwIf(count > 0, ErrorCode.OPERATION_ERROR, "当前手机号或身份证号已申请过"); AdvancementApply advancementApply = commonService.copyProperties(advancementApplyAddRequest, AdvancementApply.class); advancementApplyService.save(advancementApply); return ResultUtils.success(advancementApply.getId()); diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java index 8d18cd8..1a5d617 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java @@ -81,20 +81,20 @@ public class UserInfoController { - @PostMapping("test") - public BaseResponse test() throws IOException { - List list = userInfoService.list(); - List userMainInfoList = userMainInfoService.list(); - for (UserInfo userInfo : list) { - String userRole = userInfo.getUserRole(); - UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole); - String wxQrCode = wechatGetQrcodeService.getWxQrCode(userInfo.getInvitationCode(), userRoleEnum); - UserMainInfo userMainInfo = UserMainInfo.builder().userId(userInfo.getId()).inviteQrCode(wxQrCode).build(); - userMainInfoList.add(userMainInfo); - } - userMainInfoService.saveOrUpdateBatch(userMainInfoList); - return ResultUtils.success(true); - } +// @PostMapping("test") +// public BaseResponse test() throws IOException { +// List list = userInfoService.list(); +// List userMainInfoList = userMainInfoService.list(); +// for (UserInfo userInfo : list) { +// String userRole = userInfo.getUserRole(); +// UserRoleEnum userRoleEnum = UserRoleEnum.getEnumByValue(userRole); +// String wxQrCode = wechatGetQrcodeService.getWxQrCode(userInfo.getInvitationCode(), userRoleEnum); +// UserMainInfo userMainInfo = UserMainInfo.builder().userId(userInfo.getId()).inviteQrCode(wxQrCode).build(); +// userMainInfoList.add(userMainInfo); +// } +// userMainInfoService.saveOrUpdateBatch(userMainInfoList); +// return ResultUtils.success(true); +// }