From 4a3eac906679bd75af58369300ef4c6bc46eef0f Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Tue, 15 Jul 2025 22:33:48 +0800 Subject: [PATCH] =?UTF-8?q?web=E7=AB=AF=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=A9=E6=95=88=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8A=BD=E6=88=90=E6=AF=94=E4=BE=8B=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userInfo/UserPerformanceSummaryController.java | 12 ++++++++++++ .../UserPerformanceSummaryDetailVO.java | 6 ++++++ 2 files changed, 18 insertions(+) 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;