admin/qingcheng-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

web端分页查询绩效接口添加一个抽成比例的字段

Browse Source
This commit is contained in:
chen-xin-zhi
2025-07-16 01:44:09 +08:00
parent 4a3eac9066
commit 4a5082413a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/greenorange/promotion/controller/userInfo/UserPerformanceSummaryController.java
View File

@ -574,6 +574,11 @@ public class UserPerformanceSummaryController {
List<UserPerformanceSummary> userPerformanceSummaryList = userPerformanceSummaryService.list(userPerformanceSummaryQueryWrapper); List<UserPerformanceSummary> userPerformanceSummaryList = userPerformanceSummaryService.list(userPerformanceSummaryQueryWrapper);
List<UserPerformanceSummaryDetailVO> userPerformanceSummaryDetailVOS = commonService.convertList(userPerformanceSummaryList, UserPerformanceSummaryDetailVO.class); List<UserPerformanceSummaryDetailVO> userPerformanceSummaryDetailVOS = commonService.convertList(userPerformanceSummaryList, UserPerformanceSummaryDetailVO.class);
// 查询抽成比例
RakeRewardsQueryRequest rakeRewardsQueryRequest = new RakeRewardsQueryRequest();
rakeRewardsQueryRequest.setLevel("first");
BigDecimal rewardsRate = userPerformanceSummaryService.queryRakeRewardsRateByLevel(rakeRewardsQueryRequest);
// 封装Map集合（键:用户id, 值：用户信息） // 封装Map集合（键:用户id, 值：用户信息）
Map<Long, UserInfo> userInfoMap = new HashMap<>(); Map<Long, UserInfo> userInfoMap = new HashMap<>();
for (UserInfo userInfo : userInfoList) userInfoMap.put(userInfo.getId(), userInfo); for (UserInfo userInfo : userInfoList) userInfoMap.put(userInfo.getId(), userInfo);
@ -581,6 +586,7 @@ public class UserPerformanceSummaryController {
UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId()); UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId());
userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName()); userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName());
userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber()); userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber());
userPerformanceSummaryDetailVO.setRakeRewardsRate(rewardsRate);
} }
return ResultUtils.success(userPerformanceSummaryDetailVOS); return ResultUtils.success(userPerformanceSummaryDetailVOS);
} }
@ -612,6 +618,11 @@ public class UserPerformanceSummaryController {
List<UserPerformanceSummary> userPerformanceSummaryList = userPerformanceSummaryService.list(userPerformanceSummaryQueryWrapper); List<UserPerformanceSummary> userPerformanceSummaryList = userPerformanceSummaryService.list(userPerformanceSummaryQueryWrapper);
List<UserPerformanceSummaryDetailVO> userPerformanceSummaryDetailVOS = commonService.convertList(userPerformanceSummaryList, UserPerformanceSummaryDetailVO.class); List<UserPerformanceSummaryDetailVO> userPerformanceSummaryDetailVOS = commonService.convertList(userPerformanceSummaryList, UserPerformanceSummaryDetailVO.class);
// 查询抽成比例
RakeRewardsQueryRequest rakeRewardsQueryRequest = new RakeRewardsQueryRequest();
rakeRewardsQueryRequest.setLevel("second");
BigDecimal rewardsRate = userPerformanceSummaryService.queryRakeRewardsRateByLevel(rakeRewardsQueryRequest);
// 封装Map集合（键:用户id, 值：用户信息） // 封装Map集合（键:用户id, 值：用户信息）
Map<Long, UserInfo> userInfoMap = new HashMap<>(); Map<Long, UserInfo> userInfoMap = new HashMap<>();
for (UserInfo userInfo : userInfoList) userInfoMap.put(userInfo.getId(), userInfo); for (UserInfo userInfo : userInfoList) userInfoMap.put(userInfo.getId(), userInfo);
@ -619,6 +630,7 @@ public class UserPerformanceSummaryController {
UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId()); UserInfo userInfo = userInfoMap.get(userPerformanceSummaryDetailVO.getUserId());
userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName()); userPerformanceSummaryDetailVO.setNickName(userInfo.getNickName());
userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber()); userPerformanceSummaryDetailVO.setPhoneNumber(userInfo.getPhoneNumber());
userPerformanceSummaryDetailVO.setRakeRewardsRate(rewardsRate);
} }
return ResultUtils.success(userPerformanceSummaryDetailVOS); return ResultUtils.success(userPerformanceSummaryDetailVOS);
} }