初步完成小程序模块
This commit is contained in:
@ -83,7 +83,7 @@ public class ProjectCommissionController {
|
||||
lambdaQueryWrapper.eq(ProjectCommission::getUserId, userId);
|
||||
List<ProjectCommission> projectCommissionList = projectCommissionService.list(lambdaQueryWrapper);
|
||||
|
||||
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, "id");
|
||||
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId);
|
||||
// 封装Map集合(键:项目明细id,值:项目明细名称)
|
||||
Map<Long, String> projectDetailMap = new HashMap<>();
|
||||
// 封装Map集合(键:项目明细id,值:项目明细最大抽佣比例)
|
||||
@ -119,7 +119,7 @@ public class ProjectCommissionController {
|
||||
pdcMap.put(projectId, pdcList);
|
||||
}
|
||||
// 封装项目抽佣列表
|
||||
List<Project> projectList = commonService.findByFieldInTargetField(projectCommissionList, projectService, ProjectCommission::getProjectId, "id");
|
||||
List<Project> projectList = commonService.findByFieldInTargetField(projectCommissionList, projectService, ProjectCommission::getProjectId, Project::getId);
|
||||
List<ProjectCommissionVO> projectCommissionVOList = new ArrayList<>();
|
||||
for (Project project : projectList) {
|
||||
ProjectCommissionVO projectCommissionVO = commonService.copyProperties(project, ProjectCommissionVO.class);
|
||||
@ -185,7 +185,7 @@ public class ProjectCommissionController {
|
||||
lambdaQueryWrapper.eq(SubUserProjectCommission::getUserId, userId);
|
||||
List<SubUserProjectCommission> subUserProjectCommissionList = subUserProjectCommissionService.list(lambdaQueryWrapper);
|
||||
|
||||
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(subUserProjectCommissionList, projectDetailService, SubUserProjectCommission::getProjectDetailId, "id");
|
||||
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(subUserProjectCommissionList, projectDetailService, SubUserProjectCommission::getProjectDetailId, ProjectDetail::getId);
|
||||
// 封装Map集合(键:项目明细id,值:项目明细名称)
|
||||
Map<Long, String> projectDetailMap = new HashMap<>();
|
||||
// 封装Map集合(键:项目明细id,值:项目明细最大抽佣比例)
|
||||
@ -280,7 +280,7 @@ public class ProjectCommissionController {
|
||||
projectCommissionLambdaQueryWrapper.eq(ProjectCommission::getUserId, userId);
|
||||
List<ProjectCommission> projectCommissionList = projectCommissionService.list(projectCommissionLambdaQueryWrapper);
|
||||
|
||||
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, "id");
|
||||
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId);
|
||||
// 封装map集合(键:项目明细id, 值:项目明细最大抽佣比例)
|
||||
Map<Long, BigDecimal> map = new HashMap<>();
|
||||
for (ProjectDetail projectDetail : projectDetailList) {
|
||||
|
@ -111,6 +111,9 @@ public class ProjectController {
|
||||
projectDetailLambdaQueryWrapper.eq(ProjectDetail::getProjectId, id);
|
||||
List<ProjectDetail> projectDetailList = projectDetailService.list(projectDetailLambdaQueryWrapper);
|
||||
List<ProjectDetailVO> projectDetailVOS = commonService.convertList(projectDetailList, ProjectDetailVO.class);
|
||||
|
||||
// 更新项目明细价格
|
||||
|
||||
projectDetailVO.setProjectNotificationVOList(projectNotificationVOS);
|
||||
projectDetailVO.setProjectDetailVOList(projectDetailVOS);
|
||||
return ResultUtils.success(projectDetailVO);
|
||||
@ -122,9 +125,9 @@ public class ProjectController {
|
||||
* @return 推广的项目列表
|
||||
*/
|
||||
@PostMapping("get/running")
|
||||
@Operation(summary = "小程序用户查看项目列表", description = "参数:无,权限:管理员,方法名:queryUserProjectList")
|
||||
@Operation(summary = "小程序用户查看正在推广的项目", description = "参数:无,权限:管理员,方法名:queryUserProjectList")
|
||||
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
|
||||
@SysLog(title = "项目管理", content = "小程序用户查看项目列表")
|
||||
@SysLog(title = "项目管理", content = "小程序用户查看正在推广的项目")
|
||||
public BaseResponse<List<UserProjectVO>> queryUserProjectList(HttpServletRequest request) {
|
||||
Long userId = (Long) request.getAttribute("userId");
|
||||
LambdaQueryWrapper<UserProject> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
|
@ -69,7 +69,7 @@ public class UserMainInfoController {
|
||||
LambdaQueryWrapper<UserInfo> userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
userInfoLambdaQueryWrapper.eq(UserInfo::getParentUserId, userId);
|
||||
List<UserInfo> userInfoList = userInfoService.list(userInfoLambdaQueryWrapper);
|
||||
List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, "userId");
|
||||
List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId);
|
||||
// 封装Map集合(键:用户id,值:用户信息)
|
||||
Map<Long, UserInfo> userInfoMap = new HashMap<>();
|
||||
for (UserInfo userInfo : userInfoList) {
|
||||
|
Reference in New Issue
Block a user