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 1366fdd..1129a81 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java @@ -125,6 +125,11 @@ public class UserPerformanceSummaryController { List userPerformanceSummaryList = page.getRecords(); 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); @@ -132,6 +137,7 @@ public class UserPerformanceSummaryController { UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId()); userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName()); userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber()); + userPerformanceSummaryDetailVO.setRakeRewardsRate(rewardsRate); } Page voPage = new Page<>(current, pageSize); @@ -172,6 +178,11 @@ public class UserPerformanceSummaryController { List userPerformanceSummaryList = page.getRecords(); 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); @@ -179,6 +190,7 @@ public class UserPerformanceSummaryController { UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId()); userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName()); userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber()); + userPerformanceSummaryDetailVO.setRakeRewardsRate(rewardsRate); } Page voPage = new Page<>(current, pageSize); diff --git a/src/main/java/com/greenorange/promotion/model/vo/userPerformanceSummary/UserPerformanceSummaryDetailVO.java b/src/main/java/com/greenorange/promotion/model/vo/userPerformanceSummary/UserPerformanceSummaryDetailVO.java index c4ba402..d3666f3 100644 --- a/src/main/java/com/greenorange/promotion/model/vo/userPerformanceSummary/UserPerformanceSummaryDetailVO.java +++ b/src/main/java/com/greenorange/promotion/model/vo/userPerformanceSummary/UserPerformanceSummaryDetailVO.java @@ -92,6 +92,12 @@ public class UserPerformanceSummaryDetailVO implements Serializable { @Schema(description = "用户id", example = "1") private Long userId; + /** + * 抽成比例 + */ + @Schema(description = "抽成比例", example = "0.05") + private BigDecimal rakeRewardsRate; + @Serial private static final long serialVersionUID = 1L;