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-15 22:33:48 +08:00
parent 02ad26dcdd
commit 4a3eac9066
2 changed files with 18 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

@ -125,6 +125,11 @@ public class UserPerformanceSummaryController {
List<UserPerformanceSummary> userPerformanceSummaryList = page.getRecords(); List<UserPerformanceSummary> userPerformanceSummaryList = page.getRecords();
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);
@ -132,6 +137,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);
} }
Page<UserPerformanceSummaryDetailVO> voPage = new Page<>(current, pageSize); Page<UserPerformanceSummaryDetailVO> voPage = new Page<>(current, pageSize);
@ -172,6 +178,11 @@ public class UserPerformanceSummaryController {
List<UserPerformanceSummary> userPerformanceSummaryList = page.getRecords(); List<UserPerformanceSummary> userPerformanceSummaryList = page.getRecords();
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);
@ -179,6 +190,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);
} }
Page<UserPerformanceSummaryDetailVO> voPage = new Page<>(current, pageSize); Page<UserPerformanceSummaryDetailVO> voPage = new Page<>(current, pageSize);

6
src/main/java/com/greenorange/promotion/model/vo/userPerformanceSummary/UserPerformanceSummaryDetailVO.java
View File

@ -92,6 +92,12 @@ public class UserPerformanceSummaryDetailVO implements Serializable {
@Schema(description = "用户id", example = "1") @Schema(description = "用户id", example = "1")
private Long userId; private Long userId;
/**
* 抽成比例
*/
@Schema(description = "抽成比例", example = "0.05")
private BigDecimal rakeRewardsRate;
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;