diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java index 1129a81..4e14a35 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java @@ -574,6 +574,11 @@ public class UserPerformanceSummaryController { List userPerformanceSummaryList = userPerformanceSummaryService.list(userPerformanceSummaryQueryWrapper); List userPerformanceSummaryDetailVOS = commonService.convertList(userPerformanceSummaryList, UserPerformanceSummaryDetailVO.class); + // 查询抽成比例 + RakeRewardsQueryRequest rakeRewardsQueryRequest = new RakeRewardsQueryRequest(); + rakeRewardsQueryRequest.setLevel("first"); + BigDecimal rewardsRate = userPerformanceSummaryService.queryRakeRewardsRateByLevel(rakeRewardsQueryRequest); + // 封装Map集合(键:用户id, 值:用户信息) Map userInfoMap = new HashMap<>(); for (UserInfo userInfo : userInfoList) userInfoMap.put(userInfo.getId(), userInfo); @@ -581,6 +586,7 @@ public class UserPerformanceSummaryController { UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId()); userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName()); userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber()); + userPerformanceSummaryDetailVO.setRakeRewardsRate(rewardsRate); } return ResultUtils.success(userPerformanceSummaryDetailVOS); } @@ -612,6 +618,11 @@ public class UserPerformanceSummaryController { List userPerformanceSummaryList = userPerformanceSummaryService.list(userPerformanceSummaryQueryWrapper); List userPerformanceSummaryDetailVOS = commonService.convertList(userPerformanceSummaryList, UserPerformanceSummaryDetailVO.class); + // 查询抽成比例 + RakeRewardsQueryRequest rakeRewardsQueryRequest = new RakeRewardsQueryRequest(); + rakeRewardsQueryRequest.setLevel("second"); + BigDecimal rewardsRate = userPerformanceSummaryService.queryRakeRewardsRateByLevel(rakeRewardsQueryRequest); + // 封装Map集合(键:用户id, 值:用户信息) Map userInfoMap = new HashMap<>(); for (UserInfo userInfo : userInfoList) userInfoMap.put(userInfo.getId(), userInfo); @@ -619,6 +630,7 @@ public class UserPerformanceSummaryController { UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId()); userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName()); userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber()); + userPerformanceSummaryDetailVO.setRakeRewardsRate(rewardsRate); } return ResultUtils.success(userPerformanceSummaryDetailVOS); }