From 656bee3ad10b3fe88efe9ebb2507368775acc0b5 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Mon, 30 Jun 2025 09:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/ProjectCommissionController.java | 6 -- .../project/ProjectDetailController.java | 5 +- .../WithdrawalApplyController.java | 3 - .../userInfo/AdvancementApplyController.java | 3 +- .../userInfo/UserAccountController.java | 13 +-- .../userInfo/UserMainInfoController.java | 100 ------------------ .../service/userInfo/UserInfoService.java | 8 +- .../userInfo/impl/UserInfoServiceImpl.java | 14 ++- 8 files changed, 26 insertions(+), 126 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java index 6e35d7a..b70d20d 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectCommissionController.java @@ -68,12 +68,6 @@ public class ProjectCommissionController { @Resource private UserInfoService userInfoService; - @Resource - private UserMainInfoService userMainInfoService; - - - - /** * 小程序用户查看查询项目的抽佣情况 diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java index 5ed5964..a3088b9 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java @@ -15,6 +15,7 @@ import com.greenorange.promotion.model.dto.projectDetail.ProjectDetailAddRequest import com.greenorange.promotion.model.dto.projectDetail.ProjectDetailUpdateRequest; import com.greenorange.promotion.model.dto.subUserProjectCommission.SubUserProjectCommissionAddRequest; import com.greenorange.promotion.model.entity.*; +import com.greenorange.promotion.model.enums.UserRoleEnum; import com.greenorange.promotion.model.vo.projectDetail.ProjectDetailVO; import com.greenorange.promotion.service.common.CommonService; import com.greenorange.promotion.service.project.ProjectCommissionService; @@ -92,7 +93,9 @@ public class ProjectDetailController { projectService.updateById(project); // 获取所有的小程序用户 - List userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.DEFAULT_ROLE, userInfoService); + LambdaQueryWrapper miniUserInfoQueryWrapper = userInfoService.getMiniUserInfoQueryWrapper(); + List userInfoList = userInfoService.list(miniUserInfoQueryWrapper); + List userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId); // 封装Map(键：用户id, 值：抽佣比例） Map userCommissionRateMap = new HashMap<>(); diff --git a/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java b/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java index b01e62c..30e3fdc 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java @@ -60,9 +60,6 @@ public class WithdrawalApplyController { @Resource private UserMainInfoService userMainInfoService; - @Resource - private UserInfoService userInfoService; - @Resource private UserAccountService userAccountService; diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java index e8e9419..c360c30 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java @@ -80,7 +80,7 @@ public class AdvancementApplyController { * @return 是否更新成功 */ @PostMapping("modify/status") - @Operation(summary = "小程序端用户撤销晋升申请记录", description = "参数：晋升申请更新请求体，权限：管理员，方法名：revokeAdvancementApply") + @Operation(summary = "小程序端用户撤销晋升申请记录", description = "参数：晋升申请记录id，权限：管理员，方法名：revokeAdvancementApply") @SysLog(title = "晋升申请管理", content = "小程序端用户撤销晋升申请记录") public BaseResponse revokeAdvancementApply(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); @@ -193,6 +193,7 @@ public class AdvancementApplyController { return ResultUtils.success(advancementApplyVOPlus); } + /** * Web端管理员分页查询晋升申请 * @param advancementApplyQueryRequest 晋升申请查询请求体 diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java index 1a7877b..32a84fa 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserAccountController.java @@ -1,19 +1,12 @@ package com.greenorange.promotion.controller.userInfo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.greenorange.promotion.annotation.RequiresPermission; -import com.greenorange.promotion.annotation.SysLog; import com.greenorange.promotion.common.BaseResponse; -import com.greenorange.promotion.common.ErrorCode; import com.greenorange.promotion.common.ResultUtils; import com.greenorange.promotion.constant.UserConstant; -import com.greenorange.promotion.exception.ThrowUtils; -import com.greenorange.promotion.model.dto.CommonBatchRequest; import com.greenorange.promotion.model.dto.userAccount.UserAccountAddRequest; -import com.greenorange.promotion.model.dto.userAccount.UserAccountQueryRequest; import com.greenorange.promotion.model.dto.userAccount.UserAccountUpdateRequest; -import com.greenorange.promotion.model.entity.ProjectSettlement; import com.greenorange.promotion.model.entity.UserAccount; import com.greenorange.promotion.model.vo.userAccount.UserAccountVO; import com.greenorange.promotion.service.common.CommonService; @@ -22,17 +15,13 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.greenorange.promotion.model.dto.CommonRequest; -import jakarta.validation.Valid; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * 用户账户 控制器 diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java index 0fb61a3..176b357 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserMainInfoController.java @@ -113,104 +113,4 @@ public class UserMainInfoController { return ResultUtils.success(userTeamInfoVO); } - -// /** -// * web端管理员添加用户主要信息 -// * @param userMainInfoAddRequest 用户主要信息添加请求体 -// * @return 是否添加成功 -// */ -// @PostMapping("add") -// @Operation(summary = "web端管理员添加用户主要信息", description = "参数：用户主要信息添加请求体，权限：管理员，方法名：addUserMainInfo") -// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) -// @SysLog(title = "用户主要信息管理", content = "web端管理员添加用户主要信息") -// public BaseResponse addUserMainInfo(@Valid @RequestBody UserMainInfoAddRequest userMainInfoAddRequest) { -// UserMainInfo userMainInfo = commonService.copyProperties(userMainInfoAddRequest, UserMainInfo.class); -// userMainInfoService.save(userMainInfo); -// return ResultUtils.success(true); -// } -// -// /** -// * web端管理员根据id修改用户主要信息信息 -// * @param userMainInfoUpdateRequest 用户主要信息更新请求体 -// * @return 是否更新成功 -// */ -// @PostMapping("update") -// @Operation(summary = "web端管理员更新用户主要信息", description = "参数：用户主要信息更新请求体，权限：管理员，方法名：updateUserMainInfo") -// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) -// @SysLog(title = "用户主要信息管理", content = "web端管理员根据id修改用户主要信息信息") -// public BaseResponse updateUserMainInfo(@Valid @RequestBody UserMainInfoUpdateRequest userMainInfoUpdateRequest) { -// UserMainInfo userMainInfo = commonService.copyProperties(userMainInfoUpdateRequest, UserMainInfo.class); -// userMainInfoService.updateById(userMainInfo); -// return ResultUtils.success(true); -// } -// -// /** -// * web端管理员根据id删除用户主要信息 -// * @param commonRequest 用户主要信息删除请求体 -// * @return 是否删除成功 -// */ -// @PostMapping("delete") -// @Operation(summary = "web端管理员根据id删除用户主要信息", description = "参数：用户主要信息删除请求体，权限：管理员，方法名：delUserMainInfo") -// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) -// @SysLog(title = "用户主要信息管理", content = "web端管理员根据id删除用户主要信息") -// public BaseResponse delUserMainInfo(@Valid @RequestBody CommonRequest commonRequest) { -// Long id = commonRequest.getId(); -// userMainInfoService.removeById(id); -// return ResultUtils.success(true); -// } -// -// /** -// * web端管理员批量删除用户主要信息 -// * @param commonBatchRequest 用户主要信息批量删除请求体 -// * @return 是否删除成功 -// */ -// @PostMapping("delBatch") -// @Operation(summary = "web端管理员批量删除用户主要信息", description = "参数：用户主要信息批量删除请求体，权限：管理员，方法名：delBatchUserMainInfo") -// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) -// @SysLog(title = "用户主要信息管理", content = "web端管理员批量删除用户主要信息") -// public BaseResponse delBatchUserMainInfo(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { -// List ids = commonBatchRequest.getIds(); -// userMainInfoService.removeByIds(ids); -// return ResultUtils.success(true); -// } -// -// /** -// * web端管理员根据id查询用户主要信息 -// * @param commonRequest 用户主要信息查询请求体 -// * @return 用户主要信息信息 -// */ -// @PostMapping("queryById") -// @Operation(summary = "web端管理员根据id查询用户主要信息", description = "参数：用户主要信息查询请求体，权限：管理员，方法名：queryUserMainInfoById") -// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) -// @SysLog(title = "用户主要信息管理", content = "web端管理员根据id查询用户主要信息") -// public BaseResponse queryUserMainInfoById(@Valid @RequestBody CommonRequest commonRequest) { -// Long id = commonRequest.getId(); -// UserMainInfo userMainInfo = userMainInfoService.getById(id); -// ThrowUtils.throwIf(userMainInfo == null, ErrorCode.OPERATION_ERROR, "当前用户主要信息不存在"); -// UserMainInfoVO userMainInfoVO = commonService.copyProperties(userMainInfo, UserMainInfoVO.class); -// return ResultUtils.success(userMainInfoVO); -// } - -// /** -// * Web端管理员分页查询用户主要信息 -// * @param userMainInfoQueryRequest 用户主要信息查询请求体 -// * @return 用户主要信息列表 -// */ -// @PostMapping("page") -// @Operation(summary = "Web端管理员分页查询用户主要信息", description = "参数：用户主要信息查询请求体，权限：管理员，方法名：listUserMainInfoByPage") -// @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) -// @SysLog(title = "用户主要信息管理", content = "Web端管理员分页查询用户主要信息") -// public BaseResponse> listUserMainInfoByPage(@Valid @RequestBody UserMainInfoQueryRequest userMainInfoQueryRequest) { -// long current = userMainInfoQueryRequest.getCurrent(); -// long pageSize = userMainInfoQueryRequest.getPageSize(); -// QueryWrapper queryWrapper = userMainInfoService.getQueryWrapper(userMainInfoQueryRequest); -// Page page = userMainInfoService.page(new Page<>(current, pageSize), queryWrapper); -// List userMainInfoList = page.getRecords(); -// List userMainInfoVOList = commonService.convertList(userMainInfoList, UserMainInfoVO.class); -// Page voPage = new Page<>(current, pageSize); -// voPage.setRecords(userMainInfoVOList); -// voPage.setPages(page.getPages()); -// voPage.setTotal(page.getTotal()); -// return ResultUtils.success(voPage); -// } } \ No newline at end of file diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java b/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java index 0573a85..2b9737d 100644 --- a/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java +++ b/src/main/java/com/greenorange/promotion/service/userInfo/UserInfoService.java @@ -80,7 +80,7 @@ public interface UserInfoService extends IService { /** - * 根据用户权限来获取条件构造器 + * 根据用户权限来获取查询条件 */ LambdaQueryWrapper getQueryWrapperByUserRole(UserRoleEnum userRoleEnum, LambdaQueryWrapper lambdaQueryWrapper); @@ -89,4 +89,10 @@ public interface UserInfoService extends IService { * 小程序端员工信息注册 */ void staffUserInfoMiniRegister(AdvancementApplyApproveRequest advancementApplyApproveRequest); + + + /** + * 获取小程序用户的查询条件 + */ + LambdaQueryWrapper getMiniUserInfoQueryWrapper(); } diff --git a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java index 592f1df..024e608 100644 --- a/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java @@ -10,7 +10,6 @@ import com.greenorange.promotion.common.ErrorCode; import com.greenorange.promotion.constant.CommonConstant; import com.greenorange.promotion.constant.SystemConstant; import com.greenorange.promotion.constant.UserConstant; -import com.greenorange.promotion.exception.BusinessException; import com.greenorange.promotion.exception.ThrowUtils; import com.greenorange.promotion.mapper.UserInfoMapper; import com.greenorange.promotion.model.dto.advancementApply.AdvancementApplyApproveRequest; @@ -326,7 +325,7 @@ public class UserInfoServiceImpl extends ServiceImpl /** - * 根据用户权限来获取条件构造器 + * 根据用户权限来获取查询条件 */ @Override public LambdaQueryWrapper getQueryWrapperByUserRole(UserRoleEnum userRoleEnum, LambdaQueryWrapper userInfoLambdaQueryWrapper) { @@ -386,6 +385,17 @@ public class UserInfoServiceImpl extends ServiceImpl } + /** + * 获取小程序用户的查询条件 + */ + @Override + public LambdaQueryWrapper getMiniUserInfoQueryWrapper() { + LambdaQueryWrapper userInfoLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userInfoLambdaQueryWrapper.in(UserInfo::getUserRole, UserRoleEnum.USER, UserRoleEnum.MANAGER, UserRoleEnum.SUPERVISOR, UserRoleEnum.STAFF); + return userInfoLambdaQueryWrapper; + } + + /** * 根据邀请码获得上级用户信息 */