diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java index 30e738a..3b7dad7 100644 --- a/src/main/java/com/greenorange/promotion/controller/course/CourseController.java +++ b/src/main/java/com/greenorange/promotion/controller/course/CourseController.java @@ -66,7 +66,7 @@ public class CourseController { @PostMapping("query/hot") @Operation(summary = "小程序端用户查看热门课程列表", description = "参数:无,权限:管理员,方法名:miniQueryHotCourseList") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程管理", content = "小程序端用户查看热门课程列表") +// @SysLog(title = "课程管理", content = "小程序端用户查看热门课程列表") public BaseResponse> miniQueryHotCourseList() { List courseList = commonService.findByFieldEqTargetField(Course::getIsShelves, true, courseService); // 降序排序并取前四个元素 @@ -87,7 +87,7 @@ public class CourseController { @PostMapping("query/type") @Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数:课程添加请求体,权限:管理员,方法名:miniQueryCourseByType") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程管理", content = "小程序端用户根据类别查看课程列表") +// @SysLog(title = "课程管理", content = "小程序端用户根据类别查看课程列表") public BaseResponse> miniQueryCourseByType(@Valid @RequestBody CommonStringRequest commonStringRequest) { String courseType = commonStringRequest.getTemplateString(); Map, Object> fieldConditions = Map.of(Course::getType, courseType, Course::getIsShelves, true); @@ -105,7 +105,7 @@ public class CourseController { @PostMapping("query/keyword") @Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数:搜索关键词,权限:管理员,方法名:miniQueryCourseByKeyword") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程管理", content = "小程序端用户根据名称搜索课程") +// @SysLog(title = "课程管理", content = "小程序端用户根据名称搜索课程") public BaseResponse> miniQueryCourseByKeyword(@Valid @RequestBody CommonStringRequest commonStringRequest) { String keyword = commonStringRequest.getTemplateString(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -124,7 +124,7 @@ public class CourseController { */ @PostMapping("query/id") @Operation(summary = "小程序端用户根据id查询课程详情", description = "参数:课程id,权限:管理员,方法名:miniQueryCourseById") - @SysLog(title = "课程管理", content = "小程序端用户根据id查询课程详情") +// @SysLog(title = "课程管理", content = "小程序端用户根据id查询课程详情") public BaseResponse miniQueryCourseById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); Course course = courseService.getById(id); @@ -142,7 +142,7 @@ public class CourseController { @PostMapping("detail/id") @Operation(summary = "小程序端用户根据id查看课程基本信息", description = "参数:课程id,权限:管理员,方法名:miniQueryCourseBaseInfo") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息") +// @SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息") public BaseResponse miniQueryCourseBaseInfo(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); Course course = courseService.getById(id); @@ -166,7 +166,7 @@ public class CourseController { @PostMapping("add") @Operation(summary = "web端管理员添加课程", description = "参数:课程添加请求体,权限:管理员,方法名:addCourse") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "web端管理员添加课程") +// @SysLog(title = "课程管理", content = "web端管理员添加课程") public BaseResponse addCourse(@Valid @RequestBody CourseAddRequest courseAddRequest) { Course course = commonService.copyProperties(courseAddRequest, Course.class); courseService.save(course); @@ -181,7 +181,7 @@ public class CourseController { @PostMapping("update") @Operation(summary = "web端管理员根据id修改课程信息", description = "参数:课程更新请求体,权限:管理员,方法名:updateCourse") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "web端管理员根据id修改课程信息") +// @SysLog(title = "课程管理", content = "web端管理员根据id修改课程信息") public BaseResponse updateCourse(@Valid @RequestBody CourseUpdateRequest courseUpdateRequest) { Course course = commonService.copyProperties(courseUpdateRequest, Course.class); courseService.updateById(course); @@ -196,7 +196,7 @@ public class CourseController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除课程", description = "参数:课程删除请求体,权限:管理员,方法名:delCourse") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "web端管理员根据id删除课程") +// @SysLog(title = "课程管理", content = "web端管理员根据id删除课程") public BaseResponse delCourse(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); courseService.removeById(id); @@ -211,7 +211,7 @@ public class CourseController { @PostMapping("delBatch") @Operation(summary = "web端管理员批量删除课程", description = "参数:课程批量删除请求体,权限:管理员,方法名:delBatchCourse") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "web端管理员批量删除课程") +// @SysLog(title = "课程管理", content = "web端管理员批量删除课程") public BaseResponse delBatchCourse(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { List ids = commonBatchRequest.getIds(); courseService.removeByIds(ids); @@ -226,7 +226,7 @@ public class CourseController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询课程", description = "参数:课程查询请求体,权限:管理员,方法名:queryCourseById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "web端管理员根据id查询课程") +// @SysLog(title = "课程管理", content = "web端管理员根据id查询课程") public BaseResponse queryCourseById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); Course course = courseService.getById(id); @@ -243,7 +243,7 @@ public class CourseController { @PostMapping("isShelves") @Operation(summary = "web端管理员上(下)架课程", description = "参数:课程查询请求体,权限:管理员,方法名:updateCourseShelvesStatus") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "web端管理员上(下)架课程") +// @SysLog(title = "课程管理", content = "web端管理员上(下)架课程") public BaseResponse updateCourseShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); Course course = courseService.getById(id); @@ -261,7 +261,7 @@ public class CourseController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询课程", description = "参数:课程查询请求体,权限:管理员,方法名:listCourseByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程管理", content = "Web端管理员分页查询课程") +// @SysLog(title = "课程管理", content = "Web端管理员分页查询课程") public BaseResponse> listCourseByPage(@Valid @RequestBody CourseQueryRequest courseQueryRequest) { long current = courseQueryRequest.getCurrent(); long pageSize = courseQueryRequest.getPageSize(); diff --git a/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java b/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java index 814d1db..ec25cf4 100644 --- a/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java +++ b/src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java @@ -88,7 +88,7 @@ public class CourseOrderController { @PostMapping("add") @Operation(summary = "小程序端用户生成课程订单", description = "参数:课程id,权限:管理员,方法名:addCourseOrder") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单") +// @SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单") public BaseResponse addCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest, HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); UserInfo userInfo = userInfoService.getById(userId); @@ -266,7 +266,7 @@ public class CourseOrderController { @PostMapping("cancel") @Operation(summary = "小程序端用户取消课程订单", description = "参数:订单id,权限:管理员,方法名:cancelCourseOrder") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程订单管理", content = "小程序端用户取消课程订单") +// @SysLog(title = "课程订单管理", content = "小程序端用户取消课程订单") public BaseResponse cancelCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest) { Long courseId = courseOrderAddRequest.getCourseId(); CourseOrder courseOrder = courseOrderService.getById(courseId); @@ -286,7 +286,7 @@ public class CourseOrderController { @PostMapping("query/list") @Operation(summary = "小程序端用户查询课程订单列表", description = "参数:无,权限:管理员,方法名:queryCourseOrderList") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程订单管理", content = "小程序端用户查询课程订单列表") +// @SysLog(title = "课程订单管理", content = "小程序端用户查询课程订单列表") public BaseResponse> queryCourseOrderList(HttpServletRequest request) { Long userId = (Long) request.getAttribute("userId"); List courseOrderList = commonService.findByFieldEqTargetField(CourseOrder::getUserId, userId, courseOrderService); @@ -303,7 +303,7 @@ public class CourseOrderController { @PostMapping("query/detail") @Operation(summary = "小程序端用户根据id查询订单详情", description = "参数:订单id,权限:管理员,方法名:queryCourseOrderDetailById") @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) - @SysLog(title = "课程订单管理", content = "小程序端用户根据id查询订单详情") +// @SysLog(title = "课程订单管理", content = "小程序端用户根据id查询订单详情") public BaseResponse queryCourseOrderDetailById(@RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); CourseOrder courseOrder = courseOrderService.getById(id); @@ -361,7 +361,7 @@ public class CourseOrderController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询课程订单", description = "参数:课程订单查询请求体,权限:管理员,方法名:queryCourseOrderById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程订单管理", content = "web端管理员根据id查询课程订单") +// @SysLog(title = "课程订单管理", content = "web端管理员根据id查询课程订单") public BaseResponse queryCourseOrderById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); CourseOrder courseOrder = courseOrderService.getById(id); @@ -377,7 +377,7 @@ public class CourseOrderController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询课程订单", description = "参数:课程订单查询请求体,权限:管理员,方法名:listCourseOrderByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "课程订单管理", content = "Web端管理员分页查询课程订单") +// @SysLog(title = "课程订单管理", content = "Web端管理员分页查询课程订单") public BaseResponse> listCourseOrderByPage(@Valid @RequestBody CourseOrderQueryRequest courseOrderQueryRequest) { long current = courseOrderQueryRequest.getCurrent(); long pageSize = courseOrderQueryRequest.getPageSize(); diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java index b92b544..8684caa 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java @@ -119,7 +119,8 @@ public class ProjectController { List projectDetailVOS = commonService.convertList(projectDetailList, ProjectDetailVO.class); // 将项目明细的价格修改为当前用户的单价 Map, Object> fieldConditions = Map.of(ProjectCommission::getUserId, userId, ProjectCommission::getProjectId, id); - List projectCommissionList = commonService.findByFieldEqTargetFields(fieldConditions, projectCommissionService); + List projectCommissionList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(fieldConditions, projectCommissionService, + List.of(ProjectCommission::getProjectDetailId, ProjectCommission::getMyUnitPrice)); // 封装Map集合(键:项目明细id, 值:项目结算价格) Map projectCommissionMap = new HashMap<>(); for (ProjectCommission projectCommission : projectCommissionList) { @@ -174,7 +175,7 @@ public class ProjectController { @PostMapping("add") @Operation(summary = "web端管理员添加项目", description = "参数:项目添加请求体,权限:管理员,方法名:addProject") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目管理", content = "web端管理员添加项目") +// @SysLog(title = "项目管理", content = "web端管理员添加项目") public BaseResponse addProject(@Valid @RequestBody ProjectAddRequest projectAddRequest) { Project project = commonService.copyProperties(projectAddRequest, Project.class); projectService.save(project); @@ -189,12 +190,13 @@ public class ProjectController { @PostMapping("update") @Operation(summary = "web端管理员更新项目", description = "参数:项目更新请求体,权限:管理员,方法名:updateProject") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目管理", content = "web端管理员根据id修改项目信息") +// @SysLog(title = "项目管理", content = "web端管理员根据id修改项目信息") public BaseResponse updateProject(@Valid @RequestBody ProjectUpdateRequest projectUpdateRequest) { Project project = commonService.copyProperties(projectUpdateRequest, Project.class); projectService.updateById(project); // 批量修改用户项目记录 - List userProjectList = commonService.findByFieldEqTargetField(UserProject::getProjectId, project.getId(), userProjectService); + List userProjectList = commonService.findByFieldEqTargetFieldWithSpecificFields(UserProject::getProjectId, project.getId(), userProjectService, + List.of(UserProject::getId)); for (UserProject userProject : userProjectList) { userProject.setProjectName(project.getProjectName()); userProject.setProjectImage(project.getProjectImage()); @@ -212,7 +214,7 @@ public class ProjectController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除项目", description = "参数:项目删除请求体,权限:管理员,方法名:delProject") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目管理", content = "web端管理员根据id删除项目") +// @SysLog(title = "项目管理", content = "web端管理员根据id删除项目") public BaseResponse delProject(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); projectService.removeById(id); @@ -261,7 +263,7 @@ public class ProjectController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询项目", description = "参数:项目查询请求体,权限:管理员,方法名:queryProjectById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目管理", content = "web端管理员根据id查询项目") +// @SysLog(title = "项目管理", content = "web端管理员根据id查询项目") public BaseResponse queryProjectById(@Valid @RequestBody CommonRequest commonRequest) { ProjectVO projectVO = projectService.queryProjectById(commonRequest); return ResultUtils.success(projectVO); @@ -275,7 +277,7 @@ public class ProjectController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询项目", description = "参数:项目查询请求体,权限:管理员,方法名:listProjectByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目管理", content = "Web端管理员分页查询项目") +// @SysLog(title = "项目管理", content = "Web端管理员分页查询项目") public BaseResponse> listProjectByPage(@Valid @RequestBody ProjectQueryRequest projectQueryRequest) { long current = projectQueryRequest.getCurrent(); long pageSize = projectQueryRequest.getPageSize(); @@ -298,7 +300,7 @@ public class ProjectController { @PostMapping("shelves") @Operation(summary = "Web端管理员上(下)架项目", description = "参数:项目id,权限:管理员(admin, boss),方法名:updateProjectShelvesStatus") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目管理", content = "Web端管理员上(下)架项目") +// @SysLog(title = "项目管理", content = "Web端管理员上(下)架项目") public BaseResponse updateProjectShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) { // 获取当前服务类商品的上(下)架状态 Long id = commonRequest.getId(); 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 b3ab607..a4f9f46 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java @@ -80,7 +80,7 @@ public class ProjectDetailController { @PostMapping("add") @Operation(summary = "web端管理员添加项目明细", description = "参数:项目明细添加请求体,权限:管理员,方法名:addProjectDetail") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目明细管理", content = "web端管理员添加项目明细") +// @SysLog(title = "项目明细管理", content = "web端管理员添加项目明细") public BaseResponse addProjectDetail(@Valid @RequestBody ProjectDetailAddRequest projectDetailAddRequest) { Long proId = projectDetailAddRequest.getProjectId(); Project pro = projectService.getById(proId); @@ -96,9 +96,11 @@ public class ProjectDetailController { // 获取所有的小程序用户 LambdaQueryWrapper miniUserInfoQueryWrapper = userInfoService.getMiniUserInfoQueryWrapper(); + miniUserInfoQueryWrapper.select(UserInfo::getId, UserInfo::getParentUserId); List userInfoList = userInfoService.list(miniUserInfoQueryWrapper); - List userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId); + List userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId, + List.of(UserMainInfo::getUserId, UserMainInfo::getUniteRate)); // 封装Map(键:用户id, 值:抽佣比例) Map userCommissionRateMap = new HashMap<>(); for (UserMainInfo userMainInfo : userMainInfoList) { @@ -132,7 +134,7 @@ public class ProjectDetailController { List subUserProjectCommissionAddRequestList = new ArrayList<>(); for (UserInfo userInfo : userInfoList) { if (userInfo.getParentUserId() == 0) continue; - SubUserProjectCommissionAddRequest subUserProjectCommissionAddRequest = SubUserProjectCommissionAddRequest.builder() + SubUserProjectCommissionAddRequest subUserProjectCommissionAddRequest = SubUserProjectCommissionAddRequest.builder() .projectDetailId(projectDetailId) .myUnitPrice(projectSettlementPrice) .projectId(projectId) @@ -264,7 +266,7 @@ public class ProjectDetailController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除项目明细", description = "参数:项目明细删除请求体,权限:管理员,方法名:delProjectDetail") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目明细管理", content = "web端管理员根据id删除项目明细") +// @SysLog(title = "项目明细管理", content = "web端管理员根据id删除项目明细") public BaseResponse delProjectDetail(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); // 更新项目价格 @@ -297,7 +299,7 @@ public class ProjectDetailController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询项目明细", description = "参数:项目明细查询请求体,权限:管理员,方法名:queryProjectDetailById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目明细管理", content = "web端管理员根据id查询项目明细") +// @SysLog(title = "项目明细管理", content = "web端管理员根据id查询项目明细") public BaseResponse queryProjectDetailById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); ProjectDetail projectDetail = projectDetailService.getById(id); @@ -314,7 +316,7 @@ public class ProjectDetailController { @PostMapping("query/pid") @Operation(summary = "web端管理员根据项目id查询项目明细", description = "参数:项目id,权限:管理员,方法名:queryProjectDetailByPid") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目明细管理", content = "web端管理员根据项目id查询项目明细") +// @SysLog(title = "项目明细管理", content = "web端管理员根据项目id查询项目明细") public BaseResponse> queryProjectDetailByPid(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); List projectDetailList = commonService.findByFieldEqTargetField(ProjectDetail::getProjectId, id, projectDetailService); diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java index 8936c94..ed552e3 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java @@ -80,7 +80,7 @@ public class ProjectNotificationController { @PostMapping("add") @Operation(summary = "web端管理员添加项目通知", description = "参数:项目通知添加请求体,权限:管理员,方法名:addProjectNotification") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目通知管理", content = "web端管理员添加项目通知") +// @SysLog(title = "项目通知管理", content = "web端管理员添加项目通知") public BaseResponse addProjectNotification(@Valid @RequestBody ProjectNotificationAddRequest projectNotificationAddRequest) { Long proId = projectNotificationAddRequest.getProjectId(); Project pro = projectService.getById(proId); @@ -98,7 +98,7 @@ public class ProjectNotificationController { @PostMapping("update") @Operation(summary = "web端管理员更新项目通知", description = "参数:项目通知更新请求体,权限:管理员,方法名:updateProjectNotification") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目通知管理", content = "web端管理员根据id修改项目通知信息") +// @SysLog(title = "项目通知管理", content = "web端管理员根据id修改项目通知信息") public BaseResponse updateProjectNotification(@Valid @RequestBody ProjectNotificationUpdateRequest projectNotificationUpdateRequest) { ProjectNotification projectNotification = commonService.copyProperties(projectNotificationUpdateRequest, ProjectNotification.class); projectNotificationService.updateById(projectNotification); @@ -113,7 +113,7 @@ public class ProjectNotificationController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除项目通知", description = "参数:项目通知删除请求体,权限:管理员,方法名:delProjectNotification") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目通知管理", content = "web端管理员根据id删除项目通知") +// @SysLog(title = "项目通知管理", content = "web端管理员根据id删除项目通知") public BaseResponse delProjectNotification(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); projectNotificationService.removeById(id); @@ -129,7 +129,7 @@ public class ProjectNotificationController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询项目通知", description = "参数:项目通知查询请求体,权限:管理员,方法名:queryProjectNotificationById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目通知管理", content = "web端管理员根据id查询项目通知") +// @SysLog(title = "项目通知管理", content = "web端管理员根据id查询项目通知") public BaseResponse queryProjectNotificationById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); ProjectNotification projectNotification = projectNotificationService.getById(id); @@ -146,7 +146,7 @@ public class ProjectNotificationController { @PostMapping("query/pid") @Operation(summary = "web端管理员根据项目id查询项目通知", description = "参数:项目id,权限:管理员,方法名:queryProjectNotificationByPid") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知") +// @SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知") public BaseResponse> queryProjectNotificationByPid(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); List projectNotificationList = commonService.findByFieldEqTargetField(ProjectNotification::getProjectId, id, projectNotificationService); diff --git a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java index c5807bd..75d9ed4 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java @@ -87,11 +87,11 @@ public class PromoCodeApplyController { String phoneNumber = promoCodeApplyRequest.getSalespersonPhone(); // 判断是否重复绑定了手机号 Map, Object> applyConditions = Map.of(PromoCodeApply::getUserId, userId, PromoCodeApply::getProjectId, projectId, PromoCodeApply::getSalespersonPhone, phoneNumber); - List promoCodeApplyList = commonService.findByFieldEqTargetFields(applyConditions, promoCodeApplyService); + List promoCodeApplyList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(applyConditions, promoCodeApplyService, List.of(PromoCodeApply::getId)); ThrowUtils.throwIf(!promoCodeApplyList.isEmpty(), ErrorCode.OPERATION_ERROR, "不能重复绑定手机号"); Map, Object> fieldConditions = Map.of(PromoCode::getProjectId, projectId, PromoCode::getPromoCodeStatus, false); - List promoCodeList = commonService.findByFieldEqTargetFields(fieldConditions, promoCodeService); + List promoCodeList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(fieldConditions, promoCodeService, List.of(PromoCode::getId)); ThrowUtils.throwIf(promoCodeList.size() == 0, ErrorCode.OPERATION_ERROR, "当前项目没有推广码"); PromoCode promoCode = promoCodeList.get(0); promoCode.setPromoCodeStatus(true); @@ -105,7 +105,7 @@ public class PromoCodeApplyController { // 更新项目的推广人数 Map, Object> projectConditions = Map.of(UserProject::getProjectId, projectId, UserProject::getUserId, userId); - List userProjectList = commonService.findByFieldEqTargetFields(projectConditions, userProjectService); + List userProjectList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(projectConditions, userProjectService, List.of(UserProject::getId)); if (userProjectList.isEmpty()) project.setCurrentPromotionCount(project.getCurrentPromotionCount() + 1); projectService.updateById(project); @@ -154,7 +154,7 @@ public class PromoCodeApplyController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询推广码申请记录", description = "参数:推广码申请记录查询请求体,权限:管理员,方法名:listPromoCodeApplyByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码申请记录管理", content = "Web端管理员分页查询推广码申请记录") +// @SysLog(title = "推广码申请记录管理", content = "Web端管理员分页查询推广码申请记录") public BaseResponse> listPromoCodeApplyByPage(@Valid @RequestBody PromoCodeApplyQueryRequest promoCodeApplyQueryRequest) { long current = promoCodeApplyQueryRequest.getCurrent(); long pageSize = promoCodeApplyQueryRequest.getPageSize(); diff --git a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java index 52cd5b9..eb8a5e9 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java @@ -63,7 +63,7 @@ public class PromoCodeController { @PostMapping("add") @Operation(summary = "web端管理员添加推广码", description = "参数:推广码添加请求体,权限:管理员,方法名:addPromoCode") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码管理", content = "web端管理员添加推广码") +// @SysLog(title = "推广码管理", content = "web端管理员添加推广码") public BaseResponse addPromoCode(@Valid @RequestBody PromoCodeAddRequest promoCodeAddRequest) { Long proId = promoCodeAddRequest.getProjectId(); Project pro = projectService.getById(proId); @@ -81,7 +81,7 @@ public class PromoCodeController { @PostMapping("update") @Operation(summary = "web端管理员更新推广码", description = "参数:推广码更新请求体,权限:管理员,方法名:updatePromoCode") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码管理", content = "web端管理员根据id修改推广码信息") +// @SysLog(title = "推广码管理", content = "web端管理员根据id修改推广码信息") public BaseResponse updatePromoCode(@Valid @RequestBody PromoCodeUpdateRequest promoCodeUpdateRequest) { PromoCode promoCode = commonService.copyProperties(promoCodeUpdateRequest, PromoCode.class); promoCodeService.updateById(promoCode); @@ -96,7 +96,7 @@ public class PromoCodeController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除推广码", description = "参数:推广码删除请求体,权限:管理员,方法名:delPromoCode") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码管理", content = "web端管理员根据id删除推广码") +// @SysLog(title = "推广码管理", content = "web端管理员根据id删除推广码") public BaseResponse delPromoCode(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); PromoCode promoCode = promoCodeService.getById(id); @@ -114,7 +114,7 @@ public class PromoCodeController { @PostMapping("delBatch") @Operation(summary = "web端管理员批量删除推广码", description = "参数:推广码批量删除请求体,权限:管理员,方法名:delBatchPromoCode") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码管理", content = "web端管理员批量删除推广码") +// @SysLog(title = "推广码管理", content = "web端管理员批量删除推广码") public BaseResponse delBatchPromoCode(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { promoCodeService.delBatchPromoCode(commonBatchRequest); return ResultUtils.success(true); @@ -128,7 +128,7 @@ public class PromoCodeController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询推广码", description = "参数:推广码查询请求体,权限:管理员,方法名:queryPromoCodeById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码管理", content = "web端管理员根据id查询推广码") +// @SysLog(title = "推广码管理", content = "web端管理员根据id查询推广码") public BaseResponse queryPromoCodeById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); PromoCode promoCode = promoCodeService.getById(id); @@ -146,7 +146,7 @@ public class PromoCodeController { @PostMapping("queryByPid") @Operation(summary = "web端管理员根据id查询推广码", description = "参数:项目id,权限:管理员,方法名:queryPromoCodeByPid") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码") +// @SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码") public BaseResponse> queryPromoCodeByPid(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java b/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java index d5326f2..382884f 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java @@ -90,7 +90,8 @@ public class ProjectSettlementController { Long id = commonRequest.getId(); Map, Object> fieldConditions = Map.of(ProjectSettlement::getPromoCodeApplyId, id); List projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService); - List promoCodeApplyList = commonService.findByFieldInTargetField(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId); + List promoCodeApplyList = commonService.findByFieldInTargetFieldWithSpecificFields(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId, + List.of(PromoCodeApply::getId, PromoCodeApply::getSalespersonName)); // 封装Map集合(键:推广码申请记录id, 值:业务员姓名) Map salespersonNameMap = new HashMap<>(); for (PromoCodeApply promoCodeApply : promoCodeApplyList) { @@ -119,7 +120,8 @@ public class ProjectSettlementController { Long userId = (Long) request.getAttribute("userId"); Map, Object> fieldConditions = Map.of(ProjectSettlement::getUserId, userId, ProjectSettlement::getProjectId, projectId); List projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService); - List promoCodeApplyList = commonService.findByFieldInTargetField(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId); + List promoCodeApplyList = commonService.findByFieldInTargetFieldWithSpecificFields(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId, + List.of(PromoCodeApply::getId, PromoCodeApply::getSalespersonName)); // 封装Map集合(键:推广码申请记录id, 值:业务员姓名) Map salespersonNameMap = new HashMap<>(); for (PromoCodeApply promoCodeApply : promoCodeApplyList) { @@ -143,7 +145,7 @@ public class ProjectSettlementController { @Transactional(rollbackFor = Exception.class) @Operation(summary = "web端管理员添加项目结算记录", description = "参数:项目结算记录添加请求体,权限:管理员,方法名:addProjectSettlement") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目结算记录管理", content = "web端管理员添加项目结算记录") +// @SysLog(title = "项目结算记录管理", content = "web端管理员添加项目结算记录") public BaseResponse addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) { // 添加当前用户的项目结算记录 ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class); @@ -210,7 +212,8 @@ public class ProjectSettlementController { fundsChangeService.save(fundsChange); // 获取用户主要信息 - List userMainInfoList = commonService.findByFieldInTargetField(pathToRoot, userMainInfoService, Function.identity(), UserMainInfo::getUserId); + List userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(pathToRoot, userMainInfoService, Function.identity(), UserMainInfo::getUserId, + List.of(UserMainInfo::getUserId, UserMainInfo::getCurrentBalance)); // 封装Map集合(键:用户id,值:用户余额) Map userMainInfoMap = new HashMap<>(); for (UserMainInfo mainInfo : userMainInfoList) { @@ -271,7 +274,7 @@ public class ProjectSettlementController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除项目结算记录", description = "参数:项目结算记录删除请求体,权限:管理员,方法名:delProjectSettlement") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目结算记录管理", content = "web端管理员根据id删除项目结算记录") +// @SysLog(title = "项目结算记录管理", content = "web端管理员根据id删除项目结算记录") public BaseResponse delProjectSettlement(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); projectSettlementService.removeById(id); @@ -304,7 +307,7 @@ public class ProjectSettlementController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询项目结算记录", description = "参数:项目结算记录查询请求体,权限:管理员,方法名:queryProjectSettlementById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目结算记录管理", content = "web端管理员根据id查询项目结算记录") +// @SysLog(title = "项目结算记录管理", content = "web端管理员根据id查询项目结算记录") public BaseResponse queryProjectSettlementById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); ProjectSettlement projectSettlement = projectSettlementService.getById(id); @@ -321,7 +324,7 @@ public class ProjectSettlementController { @PostMapping("queryByPId") @Operation(summary = "Web端管理员根据推广码申请记录id查询项目结算记录列表", description = "参数:推广码申请记录id,权限:管理员,方法名:queryProjectSettlementByPid") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "项目结算记录管理", content = "Web端管理员根据推广码申请记录id查询项目结算记录列表") +// @SysLog(title = "项目结算记录管理", content = "Web端管理员根据推广码申请记录id查询项目结算记录列表") public BaseResponse> queryProjectSettlementByPid(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); List projectSettlementList = commonService.findByFieldEqTargetField(ProjectSettlement::getPromoCodeApplyId, id, projectSettlementService); 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 ac2ea91..013e295 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java @@ -181,7 +181,7 @@ public class WithdrawalApplyController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询提现申请记录", description = "参数:提现申请记录查询请求体,权限:管理员,方法名:listWithdrawalApplyByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录") +// @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录") public BaseResponse> listWithdrawalApplyByPage(@Valid @RequestBody WithdrawalApplyQueryRequest withdrawalApplyQueryRequest) { long current = withdrawalApplyQueryRequest.getCurrent(); long pageSize = withdrawalApplyQueryRequest.getPageSize(); 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 04de9bf..3c1738d 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java @@ -66,7 +66,7 @@ public class AdvancementApplyController { */ @PostMapping("add") @Operation(summary = "小程序端用户申请晋升", description = "参数:晋升申请添加请求体,权限:管理员,方法名:addAdvancementApply") - @SysLog(title = "晋升申请管理", content = "小程序端用户申请晋升") +// @SysLog(title = "晋升申请管理", content = "小程序端用户申请晋升") public BaseResponse addAdvancementApply(@Valid @RequestBody AdvancementApplyAddRequest advancementApplyAddRequest) { String phone = advancementApplyAddRequest.getPhone(); String verificationCode = advancementApplyAddRequest.getVerificationCode(); @@ -94,7 +94,7 @@ public class AdvancementApplyController { */ @PostMapping("modify/status") @Operation(summary = "小程序端用户撤销晋升申请记录", description = "参数:晋升申请记录id,权限:管理员,方法名:revokeAdvancementApply") - @SysLog(title = "晋升申请管理", content = "小程序端用户撤销晋升申请记录") +// @SysLog(title = "晋升申请管理", content = "小程序端用户撤销晋升申请记录") public BaseResponse revokeAdvancementApply(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); @@ -162,7 +162,7 @@ public class AdvancementApplyController { @PostMapping("approve") @Operation(summary = "web端管理员批准用户的晋升申请", description = "参数:晋升申请id,权限:管理员,方法名:approveAdvancementApply") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "晋升申请管理", content = "web端管理员批准用户的晋升申请") +// @SysLog(title = "晋升申请管理", content = "web端管理员批准用户的晋升申请") public BaseResponse approveAdvancementApply(@Valid @RequestBody AdvancementApplyApproveRequest advancementApplyApproveRequest) { userInfoService.staffUserInfoMiniRegister(advancementApplyApproveRequest); return ResultUtils.success(true); @@ -177,7 +177,7 @@ public class AdvancementApplyController { @PostMapping("reject") @Operation(summary = "web端管理员拒绝晋升申请", description = "参数:晋升申请拒绝请求体,权限:管理员,方法名:rejectAdvancementApply") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "晋升申请管理", content = "web端管理员拒绝晋升申请") +// @SysLog(title = "晋升申请管理", content = "web端管理员拒绝晋升申请") public BaseResponse rejectAdvancementApply(@Valid @RequestBody AdvancementApplyRejectRequest advancementApplyRejectRequest) { Long applyId = advancementApplyRejectRequest.getApplyId(); String rejectReason = advancementApplyRejectRequest.getRejectReason(); @@ -198,7 +198,7 @@ public class AdvancementApplyController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询晋升申请", description = "参数:晋升申请id,权限:管理员,方法名:queryAdvancementApplyById") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "晋升申请管理", content = "web端管理员根据id查询晋升申请") +// @SysLog(title = "晋升申请管理", content = "web端管理员根据id查询晋升申请") public BaseResponse queryAdvancementApplyById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); AdvancementApply advancementApply = advancementApplyService.getById(id); @@ -215,7 +215,7 @@ public class AdvancementApplyController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询晋升申请", description = "参数:晋升申请查询请求体,权限:管理员,方法名:listAdvancementApplyByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请") +// @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请") public BaseResponse> listAdvancementApplyByPage(@Valid @RequestBody AdvancementApplyQueryRequest advancementApplyQueryRequest) { long current = advancementApplyQueryRequest.getCurrent(); long pageSize = advancementApplyQueryRequest.getPageSize(); @@ -238,7 +238,7 @@ public class AdvancementApplyController { @PostMapping("query/supervisor") @Operation(summary = "Web端管理员查询主管信息列表", description = "参数:无,权限:管理员,方法名:listSupervisorUserInfo") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请") +// @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请") public BaseResponse> listSupervisorUserInfo() { List userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE, userInfoService); List supervisorUserInfoVOS = commonService.convertList(userInfoList, SupervisorUserInfoVO.class); diff --git a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java index 7cefe57..b16261c 100644 --- a/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java @@ -405,7 +405,7 @@ public class UserInfoController { */ @PostMapping("login") @Operation(summary = "web端管理员登录", description = "参数:web用户登录请求体,权限:管理员(boss, admin),方法名:userInfoLogin") - @SysLog(title = "用户管理", content = "web端管理员登录") +// @SysLog(title = "用户管理", content = "web端管理员登录") public BaseResponse userInfoLogin(@Valid @RequestBody UserInfoLoginRequest userInfoLoginRequest) { String token = userInfoService.userInfoLogin(userInfoLoginRequest); return ResultUtils.success(token); @@ -421,7 +421,7 @@ public class UserInfoController { @GetMapping("logout") @Operation(summary = "web端管理员退出登录", description = "参数:JWT,权限:管理员(boss, admin),方法名:userInfoLogout") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "用户管理", content = "web端管理员退出登录") +// @SysLog(title = "用户管理", content = "web端管理员退出登录") public BaseResponse userInfoLogout(@RequestHeader("Authorization") String token) { // 获取token的过期时间 DecodedJWT decodedJWT = jwtUtils.verify(token); @@ -444,7 +444,7 @@ public class UserInfoController { @PostMapping("add") @Operation(summary = "web端管理员添加用户", description = "参数:用户表添加请求体,权限:管理员(boss, admin),方法名:addUserInfo") @RequiresPermission(mustRole = UserConstant.BOSS_ROLE) - @SysLog(title = "用户管理", content = "web端管理员添加用户") +// @SysLog(title = "用户管理", content = "web端管理员添加用户") public BaseResponse addUserInfo(@Valid @RequestBody UserInfoAddRequest userInfoAddRequest) { UserInfo userInfo = commonService.copyProperties(userInfoAddRequest, UserInfo.class); userInfo.setParentUserId(-1L); @@ -463,7 +463,7 @@ public class UserInfoController { @PostMapping("update") @Operation(summary = "web端管理员更新用户", description = "参数:用户表更新请求体,权限:管理员(boss, admin),方法名:updateUserInfo") @RequiresPermission(mustRole = UserConstant.BOSS_ROLE) - @SysLog(title = "用户管理", content = "web端管理员根据id修改用户信息") +// @SysLog(title = "用户管理", content = "web端管理员根据id修改用户信息") public BaseResponse updateUserInfo(@Valid @RequestBody UserInfoUpdateRequest userInfoUpdateRequest) { UserInfo userInfo = commonService.copyProperties(userInfoUpdateRequest, UserInfo.class); userInfoService.updateById(userInfo); @@ -479,7 +479,7 @@ public class UserInfoController { @PostMapping("delete") @Operation(summary = "web端管理员根据id删除用户", description = "参数:用户表删除请求体,权限:管理员(boss, admin),方法名:delUserInfo") @RequiresPermission(mustRole = UserConstant.BOSS_ROLE) - @SysLog(title = "用户管理", content = "web端管理员根据id删除用户表") +// @SysLog(title = "用户管理", content = "web端管理员根据id删除用户表") public BaseResponse delUserInfo(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); userInfoService.removeById(id); @@ -496,7 +496,7 @@ public class UserInfoController { @PostMapping("delBatch") @Operation(summary = "web端管理员批量删除用户", description = "参数:用户表批量删除请求体,权限:管理员(boss, admin),方法名:delBatchUserInfo") @RequiresPermission(mustRole = UserConstant.BOSS_ROLE) - @SysLog(title = "用户管理", content = "web端管理员批量删除用户表") +// @SysLog(title = "用户管理", content = "web端管理员批量删除用户表") public BaseResponse delBatchUserInfo(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { List ids = commonBatchRequest.getIds(); userInfoService.removeByIds(ids); @@ -514,7 +514,7 @@ public class UserInfoController { @PostMapping("queryById") @Operation(summary = "web端管理员根据id查询用户", description = "参数:用户表查询请求体,权限:管理员(boss, admin),方法名:queryUserInfoById") @RequiresPermission(mustRole = UserConstant.BOSS_ROLE) - @SysLog(title = "用户管理", content = "web端管理员根据id查询用户") +// @SysLog(title = "用户管理", content = "web端管理员根据id查询用户") public BaseResponse queryUserInfoById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); UserInfo userInfo = userInfoService.getById(id); @@ -534,7 +534,7 @@ public class UserInfoController { @PostMapping("page") @Operation(summary = "Web端管理员分页查询用户", description = "参数:用户表查询请求体,权限:管理员(boss, admin),方法名:listUserInfoByPage") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) - @SysLog(title = "用户管理", content = "Web端管理员分页查看用户") +// @SysLog(title = "用户管理", content = "Web端管理员分页查看用户") public BaseResponse> listUserInfoByPage(@Valid @RequestBody UserInfoQueryRequest userInfoQueryRequest) { long current = userInfoQueryRequest.getCurrent(); long pageSize = userInfoQueryRequest.getPageSize(); diff --git a/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java b/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java index ecbddb5..eebac52 100644 --- a/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java +++ b/src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java @@ -1,62 +1,62 @@ -package com.greenorange.promotion.controller.wechat; - - -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.greenorange.promotion.common.BaseResponse; -import com.greenorange.promotion.common.ResultUtils; -import com.greenorange.promotion.utils.OrderNumberUtils; -import io.swagger.v3.oas.annotations.Hidden; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -@RestController -@Tag(name = "微信提现模块") -@RequestMapping("/payouts") -@Transactional -public class WechatPayoutsController { - - - /** - * 微信小程序积分提现到银行卡 - */ - @Hidden - @PostMapping("/points") - @Operation(summary = "微信小程序积分提现到银行卡", description = "参数:无, 权限:所有人, 方法名:getQrcode") - public BaseResponse pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException { - Map param = new HashMap<>(); - param.put("mch_id", "1700326544"); - param.put("partner_trade_no", OrderNumberUtils.generateOrderId()); - param.put("nonce_str", "fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t"); - param.put("sign", ""); - param.put("enc_bank_no", "6222031207006363442"); - param.put("enc_true_name", "陈新知"); - param.put("bank_code", "1002"); - param.put("amount", 5); - param.put("desc", "提现"); - String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank"; - String jsonParams = JSONUtil.toJsonStr(param); - String response = HttpUtil.createPost(url) - .header("Content-Type", "application/json") - .body(jsonParams) - .execute() - .body(); - - return ResultUtils.success(true); - } - - - - -} +//package com.greenorange.promotion.controller.wechat; +// +// +//import cn.hutool.http.HttpUtil; +//import cn.hutool.json.JSONUtil; +//import com.greenorange.promotion.common.BaseResponse; +//import com.greenorange.promotion.common.ResultUtils; +//import com.greenorange.promotion.utils.OrderNumberUtils; +//import io.swagger.v3.oas.annotations.Hidden; +//import io.swagger.v3.oas.annotations.Operation; +//import io.swagger.v3.oas.annotations.tags.Tag; +//import jakarta.servlet.http.HttpServletRequest; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.transaction.annotation.Transactional; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.io.IOException; +//import java.util.HashMap; +//import java.util.Map; +// +//@Slf4j +//@RestController +//@Tag(name = "微信提现模块") +//@RequestMapping("/payouts") +//@Transactional +//public class WechatPayoutsController { +// +// +// /** +// * 微信小程序积分提现到银行卡 +// */ +// @Hidden +// @PostMapping("/points") +// @Operation(summary = "微信小程序积分提现到银行卡", description = "参数:无, 权限:所有人, 方法名:getQrcode") +// public BaseResponse pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException { +// Map param = new HashMap<>(); +// param.put("mch_id", "1700326544"); +// param.put("partner_trade_no", OrderNumberUtils.generateOrderId()); +// param.put("nonce_str", "fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t"); +// param.put("sign", ""); +// param.put("enc_bank_no", "6222031207006363442"); +// param.put("enc_true_name", "陈新知"); +// param.put("bank_code", "1002"); +// param.put("amount", 5); +// param.put("desc", "提现"); +// String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank"; +// String jsonParams = JSONUtil.toJsonStr(param); +// String response = HttpUtil.createPost(url) +// .header("Content-Type", "application/json") +// .body(jsonParams) +// .execute() +// .body(); +// +// return ResultUtils.success(true); +// } +// +// +// +// +//} diff --git a/src/main/java/com/greenorange/promotion/service/project/impl/ProjectServiceImpl.java b/src/main/java/com/greenorange/promotion/service/project/impl/ProjectServiceImpl.java index 01d57a4..8c5faec 100644 --- a/src/main/java/com/greenorange/promotion/service/project/impl/ProjectServiceImpl.java +++ b/src/main/java/com/greenorange/promotion/service/project/impl/ProjectServiceImpl.java @@ -72,7 +72,8 @@ public class ProjectServiceImpl extends ServiceImpl Long userId = (Long) request.getAttribute("userId"); // 获取项目明细抽佣列表 - List projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, userId, projectCommissionService); + List projectCommissionList = commonService.findByFieldEqTargetFieldWithSpecificFields( + ProjectCommission::getUserId, userId, projectCommissionService, List.of(ProjectCommission::getProjectId, ProjectCommission::getMyUnitPrice)); // 封装Map集合(键:项目id, 值:项目总价) Map projectPriceMap = new HashMap<>(); for (ProjectCommission projectCommission : projectCommissionList) { 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 efea989..6177433 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 @@ -226,8 +226,8 @@ public class UserInfoServiceImpl extends ServiceImpl UserMainInfo userMainInfo = UserMainInfo.builder().userId(myUserInfo.getId()).inviteQrCode(invitationQrcode).build(); userMainInfoService.save(userMainInfo); -// // 批量保存当前用户的项目明细抽佣记录和下级用户项目明细抽佣记录 -// saveBatchProjectCommissionAndSubUserProjectCommission(myUserInfo.getId(), parentUserInfo.getId()); + // 批量保存当前用户的项目明细抽佣记录和下级用户项目明细抽佣记录 + saveBatchProjectCommissionAndSubUserProjectCommission(myUserInfo.getId(), parentUserInfo.getId()); } @@ -568,7 +568,8 @@ public class UserInfoServiceImpl extends ServiceImpl List projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserId, projectCommissionService); // 封装Map集合(键:项目明细id, 值:项目最小价格) Map projectDetailMinPriceMap = new HashMap<>(); - List projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId); + List projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId, + List.of(ProjectDetail::getId, ProjectDetail::getProjectMinSettlementPrice)); for (ProjectDetail projectDetail : projectDetailList) { projectDetailMinPriceMap.put(projectDetail.getId(), projectDetail.getProjectMinSettlementPrice()); } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fadf7d2..a17ec4c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod + active: test