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

优化了接口响应速度

Browse Source
This commit is contained in:
chen-xin-zhi
2025-08-19 15:49:49 +08:00
parent be18538e64
commit f7150d5dfc
15 changed files with 146 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/greenorange/promotion/controller/course/CourseController.java
View File

@ -66,7 +66,7 @@ public class CourseController {
@PostMapping("query/hot") @PostMapping("query/hot")
@Operation(summary = "小程序端用户查看热门课程列表", description = "参数：无，权限：管理员，方法名：miniQueryHotCourseList") @Operation(summary = "小程序端用户查看热门课程列表", description = "参数：无，权限：管理员，方法名：miniQueryHotCourseList")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程管理", content = "小程序端用户查看热门课程列表") // @SysLog(title = "课程管理", content = "小程序端用户查看热门课程列表")
public BaseResponse<List<CourseCardVO>> miniQueryHotCourseList() { public BaseResponse<List<CourseCardVO>> miniQueryHotCourseList() {
List<Course> courseList = commonService.findByFieldEqTargetField(Course::getIsShelves, true, courseService); List<Course> courseList = commonService.findByFieldEqTargetField(Course::getIsShelves, true, courseService);
// 降序排序并取前四个元素 // 降序排序并取前四个元素
@ -87,7 +87,7 @@ public class CourseController {
@PostMapping("query/type") @PostMapping("query/type")
@Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数：课程添加请求体，权限：管理员，方法名：miniQueryCourseByType") @Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数：课程添加请求体，权限：管理员，方法名：miniQueryCourseByType")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程管理", content = "小程序端用户根据类别查看课程列表") // @SysLog(title = "课程管理", content = "小程序端用户根据类别查看课程列表")
public BaseResponse<List<CourseCardVO>> miniQueryCourseByType(@Valid @RequestBody CommonStringRequest commonStringRequest) { public BaseResponse<List<CourseCardVO>> miniQueryCourseByType(@Valid @RequestBody CommonStringRequest commonStringRequest) {
String courseType = commonStringRequest.getTemplateString(); String courseType = commonStringRequest.getTemplateString();
Map<SFunction<Course, ?>, Object> fieldConditions = Map.of(Course::getType, courseType, Course::getIsShelves, true); Map<SFunction<Course, ?>, Object> fieldConditions = Map.of(Course::getType, courseType, Course::getIsShelves, true);
@ -105,7 +105,7 @@ public class CourseController {
@PostMapping("query/keyword") @PostMapping("query/keyword")
@Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数：搜索关键词，权限：管理员，方法名：miniQueryCourseByKeyword") @Operation(summary = "小程序端用户根据类别查看课程列表", description = "参数：搜索关键词，权限：管理员，方法名：miniQueryCourseByKeyword")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程管理", content = "小程序端用户根据名称搜索课程") // @SysLog(title = "课程管理", content = "小程序端用户根据名称搜索课程")
public BaseResponse<List<CourseCardVO>> miniQueryCourseByKeyword(@Valid @RequestBody CommonStringRequest commonStringRequest) { public BaseResponse<List<CourseCardVO>> miniQueryCourseByKeyword(@Valid @RequestBody CommonStringRequest commonStringRequest) {
String keyword = commonStringRequest.getTemplateString(); String keyword = commonStringRequest.getTemplateString();
LambdaQueryWrapper<Course> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Course> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@ -124,7 +124,7 @@ public class CourseController {
*/ */
@PostMapping("query/id") @PostMapping("query/id")
@Operation(summary = "小程序端用户根据id查询课程详情", description = "参数：课程id，权限：管理员，方法名：miniQueryCourseById") @Operation(summary = "小程序端用户根据id查询课程详情", description = "参数：课程id，权限：管理员，方法名：miniQueryCourseById")
@SysLog(title = "课程管理", content = "小程序端用户根据id查询课程详情") // @SysLog(title = "课程管理", content = "小程序端用户根据id查询课程详情")
public BaseResponse<CourseDetailVO> miniQueryCourseById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<CourseDetailVO> miniQueryCourseById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
Course course = courseService.getById(id); Course course = courseService.getById(id);
@ -142,7 +142,7 @@ public class CourseController {
@PostMapping("detail/id") @PostMapping("detail/id")
@Operation(summary = "小程序端用户根据id查看课程基本信息", description = "参数：课程id，权限：管理员，方法名：miniQueryCourseBaseInfo") @Operation(summary = "小程序端用户根据id查看课程基本信息", description = "参数：课程id，权限：管理员，方法名：miniQueryCourseBaseInfo")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息") // @SysLog(title = "课程管理", content = "小程序端用户根据id查看课程基本信息")
public BaseResponse<CourseCardVO> miniQueryCourseBaseInfo(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<CourseCardVO> miniQueryCourseBaseInfo(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
Course course = courseService.getById(id); Course course = courseService.getById(id);
@ -166,7 +166,7 @@ public class CourseController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "web端管理员添加课程", description = "参数：课程添加请求体，权限：管理员，方法名：addCourse") @Operation(summary = "web端管理员添加课程", description = "参数：课程添加请求体，权限：管理员，方法名：addCourse")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "web端管理员添加课程") // @SysLog(title = "课程管理", content = "web端管理员添加课程")
public BaseResponse<Long> addCourse(@Valid @RequestBody CourseAddRequest courseAddRequest) { public BaseResponse<Long> addCourse(@Valid @RequestBody CourseAddRequest courseAddRequest) {
Course course = commonService.copyProperties(courseAddRequest, Course.class); Course course = commonService.copyProperties(courseAddRequest, Course.class);
courseService.save(course); courseService.save(course);
@ -181,7 +181,7 @@ public class CourseController {
@PostMapping("update") @PostMapping("update")
@Operation(summary = "web端管理员根据id修改课程信息", description = "参数：课程更新请求体，权限：管理员，方法名：updateCourse") @Operation(summary = "web端管理员根据id修改课程信息", description = "参数：课程更新请求体，权限：管理员，方法名：updateCourse")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "web端管理员根据id修改课程信息") // @SysLog(title = "课程管理", content = "web端管理员根据id修改课程信息")
public BaseResponse<Boolean> updateCourse(@Valid @RequestBody CourseUpdateRequest courseUpdateRequest) { public BaseResponse<Boolean> updateCourse(@Valid @RequestBody CourseUpdateRequest courseUpdateRequest) {
Course course = commonService.copyProperties(courseUpdateRequest, Course.class); Course course = commonService.copyProperties(courseUpdateRequest, Course.class);
courseService.updateById(course); courseService.updateById(course);
@ -196,7 +196,7 @@ public class CourseController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除课程", description = "参数：课程删除请求体，权限：管理员，方法名：delCourse") @Operation(summary = "web端管理员根据id删除课程", description = "参数：课程删除请求体，权限：管理员，方法名：delCourse")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "web端管理员根据id删除课程") // @SysLog(title = "课程管理", content = "web端管理员根据id删除课程")
public BaseResponse<Boolean> delCourse(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delCourse(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
courseService.removeById(id); courseService.removeById(id);
@ -211,7 +211,7 @@ public class CourseController {
@PostMapping("delBatch") @PostMapping("delBatch")
@Operation(summary = "web端管理员批量删除课程", description = "参数：课程批量删除请求体，权限：管理员，方法名：delBatchCourse") @Operation(summary = "web端管理员批量删除课程", description = "参数：课程批量删除请求体，权限：管理员，方法名：delBatchCourse")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "web端管理员批量删除课程") // @SysLog(title = "课程管理", content = "web端管理员批量删除课程")
public BaseResponse<Boolean> delBatchCourse(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { public BaseResponse<Boolean> delBatchCourse(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
List<Long> ids = commonBatchRequest.getIds(); List<Long> ids = commonBatchRequest.getIds();
courseService.removeByIds(ids); courseService.removeByIds(ids);
@ -226,7 +226,7 @@ public class CourseController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询课程", description = "参数：课程查询请求体，权限：管理员，方法名：queryCourseById") @Operation(summary = "web端管理员根据id查询课程", description = "参数：课程查询请求体，权限：管理员，方法名：queryCourseById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "web端管理员根据id查询课程") // @SysLog(title = "课程管理", content = "web端管理员根据id查询课程")
public BaseResponse<CourseVO> queryCourseById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<CourseVO> queryCourseById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
Course course = courseService.getById(id); Course course = courseService.getById(id);
@ -243,7 +243,7 @@ public class CourseController {
@PostMapping("isShelves") @PostMapping("isShelves")
@Operation(summary = "web端管理员上（下）架课程", description = "参数：课程查询请求体，权限：管理员，方法名：updateCourseShelvesStatus") @Operation(summary = "web端管理员上（下）架课程", description = "参数：课程查询请求体，权限：管理员，方法名：updateCourseShelvesStatus")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "web端管理员上（下）架课程") // @SysLog(title = "课程管理", content = "web端管理员上（下）架课程")
public BaseResponse<Boolean> updateCourseShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> updateCourseShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
Course course = courseService.getById(id); Course course = courseService.getById(id);
@ -261,7 +261,7 @@ public class CourseController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询课程", description = "参数：课程查询请求体，权限：管理员，方法名：listCourseByPage") @Operation(summary = "Web端管理员分页查询课程", description = "参数：课程查询请求体，权限：管理员，方法名：listCourseByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程管理", content = "Web端管理员分页查询课程") // @SysLog(title = "课程管理", content = "Web端管理员分页查询课程")
public BaseResponse<Page<CourseVO>> listCourseByPage(@Valid @RequestBody CourseQueryRequest courseQueryRequest) { public BaseResponse<Page<CourseVO>> listCourseByPage(@Valid @RequestBody CourseQueryRequest courseQueryRequest) {
long current = courseQueryRequest.getCurrent(); long current = courseQueryRequest.getCurrent();
long pageSize = courseQueryRequest.getPageSize(); long pageSize = courseQueryRequest.getPageSize();

12
src/main/java/com/greenorange/promotion/controller/course/CourseOrderController.java
View File

@ -88,7 +88,7 @@ public class CourseOrderController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "小程序端用户生成课程订单", description = "参数：课程id，权限：管理员，方法名：addCourseOrder") @Operation(summary = "小程序端用户生成课程订单", description = "参数：课程id，权限：管理员，方法名：addCourseOrder")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单") // @SysLog(title = "课程订单管理", content = "小程序端用户生成课程订单")
public BaseResponse<Long> addCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest, HttpServletRequest request) { public BaseResponse<Long> addCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest, HttpServletRequest request) {
Long userId = (Long) request.getAttribute("userId"); Long userId = (Long) request.getAttribute("userId");
UserInfo userInfo = userInfoService.getById(userId); UserInfo userInfo = userInfoService.getById(userId);
@ -266,7 +266,7 @@ public class CourseOrderController {
@PostMapping("cancel") @PostMapping("cancel")
@Operation(summary = "小程序端用户取消课程订单", description = "参数：订单id，权限：管理员，方法名：cancelCourseOrder") @Operation(summary = "小程序端用户取消课程订单", description = "参数：订单id，权限：管理员，方法名：cancelCourseOrder")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程订单管理", content = "小程序端用户取消课程订单") // @SysLog(title = "课程订单管理", content = "小程序端用户取消课程订单")
public BaseResponse<Long> cancelCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest) { public BaseResponse<Long> cancelCourseOrder(@Valid @RequestBody CourseOrderAddRequest courseOrderAddRequest) {
Long courseId = courseOrderAddRequest.getCourseId(); Long courseId = courseOrderAddRequest.getCourseId();
CourseOrder courseOrder = courseOrderService.getById(courseId); CourseOrder courseOrder = courseOrderService.getById(courseId);
@ -286,7 +286,7 @@ public class CourseOrderController {
@PostMapping("query/list") @PostMapping("query/list")
@Operation(summary = "小程序端用户查询课程订单列表", description = "参数：无，权限：管理员，方法名:queryCourseOrderList") @Operation(summary = "小程序端用户查询课程订单列表", description = "参数：无，权限：管理员，方法名:queryCourseOrderList")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程订单管理", content = "小程序端用户查询课程订单列表") // @SysLog(title = "课程订单管理", content = "小程序端用户查询课程订单列表")
public BaseResponse<List<CourseOrderCardVO>> queryCourseOrderList(HttpServletRequest request) { public BaseResponse<List<CourseOrderCardVO>> queryCourseOrderList(HttpServletRequest request) {
Long userId = (Long) request.getAttribute("userId"); Long userId = (Long) request.getAttribute("userId");
List<CourseOrder> courseOrderList = commonService.findByFieldEqTargetField(CourseOrder::getUserId, userId, courseOrderService); List<CourseOrder> courseOrderList = commonService.findByFieldEqTargetField(CourseOrder::getUserId, userId, courseOrderService);
@ -303,7 +303,7 @@ public class CourseOrderController {
@PostMapping("query/detail") @PostMapping("query/detail")
@Operation(summary = "小程序端用户根据id查询订单详情", description = "参数：订单id，权限：管理员，方法名:queryCourseOrderDetailById") @Operation(summary = "小程序端用户根据id查询订单详情", description = "参数：订单id，权限：管理员，方法名:queryCourseOrderDetailById")
@RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE) @RequiresPermission(mustRole = UserConstant.DEFAULT_ROLE)
@SysLog(title = "课程订单管理", content = "小程序端用户根据id查询订单详情") // @SysLog(title = "课程订单管理", content = "小程序端用户根据id查询订单详情")
public BaseResponse<CourseOrderVO> queryCourseOrderDetailById(@RequestBody CommonRequest commonRequest) { public BaseResponse<CourseOrderVO> queryCourseOrderDetailById(@RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
CourseOrder courseOrder = courseOrderService.getById(id); CourseOrder courseOrder = courseOrderService.getById(id);
@ -361,7 +361,7 @@ public class CourseOrderController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询课程订单", description = "参数：课程订单查询请求体，权限：管理员，方法名：queryCourseOrderById") @Operation(summary = "web端管理员根据id查询课程订单", description = "参数：课程订单查询请求体，权限：管理员，方法名：queryCourseOrderById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程订单管理", content = "web端管理员根据id查询课程订单") // @SysLog(title = "课程订单管理", content = "web端管理员根据id查询课程订单")
public BaseResponse<CourseOrderVO> queryCourseOrderById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<CourseOrderVO> queryCourseOrderById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
CourseOrder courseOrder = courseOrderService.getById(id); CourseOrder courseOrder = courseOrderService.getById(id);
@ -377,7 +377,7 @@ public class CourseOrderController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询课程订单", description = "参数：课程订单查询请求体，权限：管理员，方法名：listCourseOrderByPage") @Operation(summary = "Web端管理员分页查询课程订单", description = "参数：课程订单查询请求体，权限：管理员，方法名：listCourseOrderByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "课程订单管理", content = "Web端管理员分页查询课程订单") // @SysLog(title = "课程订单管理", content = "Web端管理员分页查询课程订单")
public BaseResponse<Page<CourseOrderBaseInfoVO>> listCourseOrderByPage(@Valid @RequestBody CourseOrderQueryRequest courseOrderQueryRequest) { public BaseResponse<Page<CourseOrderBaseInfoVO>> listCourseOrderByPage(@Valid @RequestBody CourseOrderQueryRequest courseOrderQueryRequest) {
long current = courseOrderQueryRequest.getCurrent(); long current = courseOrderQueryRequest.getCurrent();
long pageSize = courseOrderQueryRequest.getPageSize(); long pageSize = courseOrderQueryRequest.getPageSize();

18
src/main/java/com/greenorange/promotion/controller/project/ProjectController.java
View File

@ -119,7 +119,8 @@ public class ProjectController {
List<ProjectDetailVO> projectDetailVOS = commonService.convertList(projectDetailList, ProjectDetailVO.class); List<ProjectDetailVO> projectDetailVOS = commonService.convertList(projectDetailList, ProjectDetailVO.class);
// 将项目明细的价格修改为当前用户的单价 // 将项目明细的价格修改为当前用户的单价
Map<SFunction<ProjectCommission, ?>, Object> fieldConditions = Map.of(ProjectCommission::getUserId, userId, ProjectCommission::getProjectId, id); Map<SFunction<ProjectCommission, ?>, Object> fieldConditions = Map.of(ProjectCommission::getUserId, userId, ProjectCommission::getProjectId, id);
List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetFields(fieldConditions, projectCommissionService); List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(fieldConditions, projectCommissionService,
List.of(ProjectCommission::getProjectDetailId, ProjectCommission::getMyUnitPrice));
// 封装Map集合（键：项目明细id, 值：项目结算价格） // 封装Map集合（键：项目明细id, 值：项目结算价格）
Map<Long, BigDecimal> projectCommissionMap = new HashMap<>(); Map<Long, BigDecimal> projectCommissionMap = new HashMap<>();
for (ProjectCommission projectCommission : projectCommissionList) { for (ProjectCommission projectCommission : projectCommissionList) {
@ -174,7 +175,7 @@ public class ProjectController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "web端管理员添加项目", description = "参数：项目添加请求体，权限：管理员，方法名：addProject") @Operation(summary = "web端管理员添加项目", description = "参数：项目添加请求体，权限：管理员，方法名：addProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目管理", content = "web端管理员添加项目") // @SysLog(title = "项目管理", content = "web端管理员添加项目")
public BaseResponse<Long> addProject(@Valid @RequestBody ProjectAddRequest projectAddRequest) { public BaseResponse<Long> addProject(@Valid @RequestBody ProjectAddRequest projectAddRequest) {
Project project = commonService.copyProperties(projectAddRequest, Project.class); Project project = commonService.copyProperties(projectAddRequest, Project.class);
projectService.save(project); projectService.save(project);
@ -189,12 +190,13 @@ public class ProjectController {
@PostMapping("update") @PostMapping("update")
@Operation(summary = "web端管理员更新项目", description = "参数：项目更新请求体，权限：管理员，方法名：updateProject") @Operation(summary = "web端管理员更新项目", description = "参数：项目更新请求体，权限：管理员，方法名：updateProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目管理", content = "web端管理员根据id修改项目信息") // @SysLog(title = "项目管理", content = "web端管理员根据id修改项目信息")
public BaseResponse<Boolean> updateProject(@Valid @RequestBody ProjectUpdateRequest projectUpdateRequest) { public BaseResponse<Boolean> updateProject(@Valid @RequestBody ProjectUpdateRequest projectUpdateRequest) {
Project project = commonService.copyProperties(projectUpdateRequest, Project.class); Project project = commonService.copyProperties(projectUpdateRequest, Project.class);
projectService.updateById(project); projectService.updateById(project);
// 批量修改用户项目记录 // 批量修改用户项目记录
List<UserProject> userProjectList = commonService.findByFieldEqTargetField(UserProject::getProjectId, project.getId(), userProjectService); List<UserProject> userProjectList = commonService.findByFieldEqTargetFieldWithSpecificFields(UserProject::getProjectId, project.getId(), userProjectService,
List.of(UserProject::getId));
for (UserProject userProject : userProjectList) { for (UserProject userProject : userProjectList) {
userProject.setProjectName(project.getProjectName()); userProject.setProjectName(project.getProjectName());
userProject.setProjectImage(project.getProjectImage()); userProject.setProjectImage(project.getProjectImage());
@ -212,7 +214,7 @@ public class ProjectController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除项目", description = "参数：项目删除请求体，权限：管理员，方法名：delProject") @Operation(summary = "web端管理员根据id删除项目", description = "参数：项目删除请求体，权限：管理员，方法名：delProject")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目管理", content = "web端管理员根据id删除项目") // @SysLog(title = "项目管理", content = "web端管理员根据id删除项目")
public BaseResponse<Boolean> delProject(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delProject(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
projectService.removeById(id); projectService.removeById(id);
@ -261,7 +263,7 @@ public class ProjectController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询项目", description = "参数：项目查询请求体，权限：管理员，方法名：queryProjectById") @Operation(summary = "web端管理员根据id查询项目", description = "参数：项目查询请求体，权限：管理员，方法名：queryProjectById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目管理", content = "web端管理员根据id查询项目") // @SysLog(title = "项目管理", content = "web端管理员根据id查询项目")
public BaseResponse<ProjectVO> queryProjectById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<ProjectVO> queryProjectById(@Valid @RequestBody CommonRequest commonRequest) {
ProjectVO projectVO = projectService.queryProjectById(commonRequest); ProjectVO projectVO = projectService.queryProjectById(commonRequest);
return ResultUtils.success(projectVO); return ResultUtils.success(projectVO);
@ -275,7 +277,7 @@ public class ProjectController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询项目", description = "参数：项目查询请求体，权限：管理员，方法名：listProjectByPage") @Operation(summary = "Web端管理员分页查询项目", description = "参数：项目查询请求体，权限：管理员，方法名：listProjectByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目管理", content = "Web端管理员分页查询项目") // @SysLog(title = "项目管理", content = "Web端管理员分页查询项目")
public BaseResponse<Page<ProjectPageVO>> listProjectByPage(@Valid @RequestBody ProjectQueryRequest projectQueryRequest) { public BaseResponse<Page<ProjectPageVO>> listProjectByPage(@Valid @RequestBody ProjectQueryRequest projectQueryRequest) {
long current = projectQueryRequest.getCurrent(); long current = projectQueryRequest.getCurrent();
long pageSize = projectQueryRequest.getPageSize(); long pageSize = projectQueryRequest.getPageSize();
@ -298,7 +300,7 @@ public class ProjectController {
@PostMapping("shelves") @PostMapping("shelves")
@Operation(summary = "Web端管理员上(下)架项目", description = "参数：项目id，权限：管理员(admin, boss)，方法名：updateProjectShelvesStatus") @Operation(summary = "Web端管理员上(下)架项目", description = "参数：项目id，权限：管理员(admin, boss)，方法名：updateProjectShelvesStatus")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目管理", content = "Web端管理员上(下)架项目") // @SysLog(title = "项目管理", content = "Web端管理员上(下)架项目")
public BaseResponse<Boolean> updateProjectShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> updateProjectShelvesStatus(@Valid @RequestBody CommonRequest commonRequest) {
// 获取当前服务类商品的上(下)架状态 // 获取当前服务类商品的上(下)架状态
Long id = commonRequest.getId(); Long id = commonRequest.getId();

14
src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java
View File

@ -80,7 +80,7 @@ public class ProjectDetailController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "web端管理员添加项目明细", description = "参数：项目明细添加请求体，权限：管理员，方法名：addProjectDetail") @Operation(summary = "web端管理员添加项目明细", description = "参数：项目明细添加请求体，权限：管理员，方法名：addProjectDetail")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目明细管理", content = "web端管理员添加项目明细") // @SysLog(title = "项目明细管理", content = "web端管理员添加项目明细")
public BaseResponse<Boolean> addProjectDetail(@Valid @RequestBody ProjectDetailAddRequest projectDetailAddRequest) { public BaseResponse<Boolean> addProjectDetail(@Valid @RequestBody ProjectDetailAddRequest projectDetailAddRequest) {
Long proId = projectDetailAddRequest.getProjectId(); Long proId = projectDetailAddRequest.getProjectId();
Project pro = projectService.getById(proId); Project pro = projectService.getById(proId);
@ -96,9 +96,11 @@ public class ProjectDetailController {
// 获取所有的小程序用户 // 获取所有的小程序用户
LambdaQueryWrapper<UserInfo> miniUserInfoQueryWrapper = userInfoService.getMiniUserInfoQueryWrapper(); LambdaQueryWrapper<UserInfo> miniUserInfoQueryWrapper = userInfoService.getMiniUserInfoQueryWrapper();
miniUserInfoQueryWrapper.select(UserInfo::getId, UserInfo::getParentUserId);
List<UserInfo> userInfoList = userInfoService.list(miniUserInfoQueryWrapper); List<UserInfo> userInfoList = userInfoService.list(miniUserInfoQueryWrapper);
List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId); List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(userInfoList, userMainInfoService, UserInfo::getId, UserMainInfo::getUserId,
List.of(UserMainInfo::getUserId, UserMainInfo::getUniteRate));
// 封装Map(键：用户id, 值：抽佣比例） // 封装Map(键：用户id, 值：抽佣比例）
Map<Long, BigDecimal> userCommissionRateMap = new HashMap<>(); Map<Long, BigDecimal> userCommissionRateMap = new HashMap<>();
for (UserMainInfo userMainInfo : userMainInfoList) { for (UserMainInfo userMainInfo : userMainInfoList) {
@ -132,7 +134,7 @@ public class ProjectDetailController {
List<SubUserProjectCommissionAddRequest> subUserProjectCommissionAddRequestList = new ArrayList<>(); List<SubUserProjectCommissionAddRequest> subUserProjectCommissionAddRequestList = new ArrayList<>();
for (UserInfo userInfo : userInfoList) { for (UserInfo userInfo : userInfoList) {
if (userInfo.getParentUserId() == 0) continue; if (userInfo.getParentUserId() == 0) continue;
SubUserProjectCommissionAddRequest subUserProjectCommissionAddRequest = SubUserProjectCommissionAddRequest.builder() SubUserProjectCommissionAddRequest subUserProjectCommissionAddRequest = SubUserProjectCommissionAddRequest.builder()
.projectDetailId(projectDetailId) .projectDetailId(projectDetailId)
.myUnitPrice(projectSettlementPrice) .myUnitPrice(projectSettlementPrice)
.projectId(projectId) .projectId(projectId)
@ -264,7 +266,7 @@ public class ProjectDetailController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除项目明细", description = "参数：项目明细删除请求体，权限：管理员，方法名：delProjectDetail") @Operation(summary = "web端管理员根据id删除项目明细", description = "参数：项目明细删除请求体，权限：管理员，方法名：delProjectDetail")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目明细管理", content = "web端管理员根据id删除项目明细") // @SysLog(title = "项目明细管理", content = "web端管理员根据id删除项目明细")
public BaseResponse<Boolean> delProjectDetail(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delProjectDetail(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
// 更新项目价格 // 更新项目价格
@ -297,7 +299,7 @@ public class ProjectDetailController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询项目明细", description = "参数：项目明细查询请求体，权限：管理员，方法名：queryProjectDetailById") @Operation(summary = "web端管理员根据id查询项目明细", description = "参数：项目明细查询请求体，权限：管理员，方法名：queryProjectDetailById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目明细管理", content = "web端管理员根据id查询项目明细") // @SysLog(title = "项目明细管理", content = "web端管理员根据id查询项目明细")
public BaseResponse<ProjectDetailVO> queryProjectDetailById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<ProjectDetailVO> queryProjectDetailById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
ProjectDetail projectDetail = projectDetailService.getById(id); ProjectDetail projectDetail = projectDetailService.getById(id);
@ -314,7 +316,7 @@ public class ProjectDetailController {
@PostMapping("query/pid") @PostMapping("query/pid")
@Operation(summary = "web端管理员根据项目id查询项目明细", description = "参数：项目id，权限：管理员，方法名：queryProjectDetailByPid") @Operation(summary = "web端管理员根据项目id查询项目明细", description = "参数：项目id，权限：管理员，方法名：queryProjectDetailByPid")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目明细管理", content = "web端管理员根据项目id查询项目明细") // @SysLog(title = "项目明细管理", content = "web端管理员根据项目id查询项目明细")
public BaseResponse<List<ProjectDetailVO>> queryProjectDetailByPid(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<List<ProjectDetailVO>> queryProjectDetailByPid(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
List<ProjectDetail> projectDetailList = commonService.findByFieldEqTargetField(ProjectDetail::getProjectId, id, projectDetailService); List<ProjectDetail> projectDetailList = commonService.findByFieldEqTargetField(ProjectDetail::getProjectId, id, projectDetailService);

10
src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java
View File

@ -80,7 +80,7 @@ public class ProjectNotificationController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "web端管理员添加项目通知", description = "参数：项目通知添加请求体，权限：管理员，方法名：addProjectNotification") @Operation(summary = "web端管理员添加项目通知", description = "参数：项目通知添加请求体，权限：管理员，方法名：addProjectNotification")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目通知管理", content = "web端管理员添加项目通知") // @SysLog(title = "项目通知管理", content = "web端管理员添加项目通知")
public BaseResponse<Boolean> addProjectNotification(@Valid @RequestBody ProjectNotificationAddRequest projectNotificationAddRequest) { public BaseResponse<Boolean> addProjectNotification(@Valid @RequestBody ProjectNotificationAddRequest projectNotificationAddRequest) {
Long proId = projectNotificationAddRequest.getProjectId(); Long proId = projectNotificationAddRequest.getProjectId();
Project pro = projectService.getById(proId); Project pro = projectService.getById(proId);
@ -98,7 +98,7 @@ public class ProjectNotificationController {
@PostMapping("update") @PostMapping("update")
@Operation(summary = "web端管理员更新项目通知", description = "参数：项目通知更新请求体，权限：管理员，方法名：updateProjectNotification") @Operation(summary = "web端管理员更新项目通知", description = "参数：项目通知更新请求体，权限：管理员，方法名：updateProjectNotification")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目通知管理", content = "web端管理员根据id修改项目通知信息") // @SysLog(title = "项目通知管理", content = "web端管理员根据id修改项目通知信息")
public BaseResponse<Boolean> updateProjectNotification(@Valid @RequestBody ProjectNotificationUpdateRequest projectNotificationUpdateRequest) { public BaseResponse<Boolean> updateProjectNotification(@Valid @RequestBody ProjectNotificationUpdateRequest projectNotificationUpdateRequest) {
ProjectNotification projectNotification = commonService.copyProperties(projectNotificationUpdateRequest, ProjectNotification.class); ProjectNotification projectNotification = commonService.copyProperties(projectNotificationUpdateRequest, ProjectNotification.class);
projectNotificationService.updateById(projectNotification); projectNotificationService.updateById(projectNotification);
@ -113,7 +113,7 @@ public class ProjectNotificationController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除项目通知", description = "参数：项目通知删除请求体，权限：管理员，方法名：delProjectNotification") @Operation(summary = "web端管理员根据id删除项目通知", description = "参数：项目通知删除请求体，权限：管理员，方法名：delProjectNotification")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目通知管理", content = "web端管理员根据id删除项目通知") // @SysLog(title = "项目通知管理", content = "web端管理员根据id删除项目通知")
public BaseResponse<Boolean> delProjectNotification(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delProjectNotification(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
projectNotificationService.removeById(id); projectNotificationService.removeById(id);
@ -129,7 +129,7 @@ public class ProjectNotificationController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询项目通知", description = "参数：项目通知查询请求体，权限：管理员，方法名：queryProjectNotificationById") @Operation(summary = "web端管理员根据id查询项目通知", description = "参数：项目通知查询请求体，权限：管理员，方法名：queryProjectNotificationById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目通知管理", content = "web端管理员根据id查询项目通知") // @SysLog(title = "项目通知管理", content = "web端管理员根据id查询项目通知")
public BaseResponse<ProjectNotificationVO> queryProjectNotificationById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<ProjectNotificationVO> queryProjectNotificationById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
ProjectNotification projectNotification = projectNotificationService.getById(id); ProjectNotification projectNotification = projectNotificationService.getById(id);
@ -146,7 +146,7 @@ public class ProjectNotificationController {
@PostMapping("query/pid") @PostMapping("query/pid")
@Operation(summary = "web端管理员根据项目id查询项目通知", description = "参数：项目id，权限：管理员，方法名：queryProjectNotificationByPid") @Operation(summary = "web端管理员根据项目id查询项目通知", description = "参数：项目id，权限：管理员，方法名：queryProjectNotificationByPid")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知") // @SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知")
public BaseResponse<List<ProjectNotificationVO>> queryProjectNotificationByPid(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<List<ProjectNotificationVO>> queryProjectNotificationByPid(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
List<ProjectNotification> projectNotificationList = commonService.findByFieldEqTargetField(ProjectNotification::getProjectId, id, projectNotificationService); List<ProjectNotification> projectNotificationList = commonService.findByFieldEqTargetField(ProjectNotification::getProjectId, id, projectNotificationService);

8
src/main/java/com/greenorange/promotion/controller/project/PromoCodeApplyController.java
View File

@ -87,11 +87,11 @@ public class PromoCodeApplyController {
String phoneNumber = promoCodeApplyRequest.getSalespersonPhone(); String phoneNumber = promoCodeApplyRequest.getSalespersonPhone();
// 判断是否重复绑定了手机号 // 判断是否重复绑定了手机号
Map<SFunction<PromoCodeApply, ?>, Object> applyConditions = Map.of(PromoCodeApply::getUserId, userId, PromoCodeApply::getProjectId, projectId, PromoCodeApply::getSalespersonPhone, phoneNumber); Map<SFunction<PromoCodeApply, ?>, Object> applyConditions = Map.of(PromoCodeApply::getUserId, userId, PromoCodeApply::getProjectId, projectId, PromoCodeApply::getSalespersonPhone, phoneNumber);
List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldEqTargetFields(applyConditions, promoCodeApplyService); List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(applyConditions, promoCodeApplyService, List.of(PromoCodeApply::getId));
ThrowUtils.throwIf(!promoCodeApplyList.isEmpty(), ErrorCode.OPERATION_ERROR, "不能重复绑定手机号"); ThrowUtils.throwIf(!promoCodeApplyList.isEmpty(), ErrorCode.OPERATION_ERROR, "不能重复绑定手机号");
Map<SFunction<PromoCode, ?>, Object> fieldConditions = Map.of(PromoCode::getProjectId, projectId, PromoCode::getPromoCodeStatus, false); Map<SFunction<PromoCode, ?>, Object> fieldConditions = Map.of(PromoCode::getProjectId, projectId, PromoCode::getPromoCodeStatus, false);
List<PromoCode> promoCodeList = commonService.findByFieldEqTargetFields(fieldConditions, promoCodeService); List<PromoCode> promoCodeList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(fieldConditions, promoCodeService, List.of(PromoCode::getId));
ThrowUtils.throwIf(promoCodeList.size() == 0, ErrorCode.OPERATION_ERROR, "当前项目没有推广码"); ThrowUtils.throwIf(promoCodeList.size() == 0, ErrorCode.OPERATION_ERROR, "当前项目没有推广码");
PromoCode promoCode = promoCodeList.get(0); PromoCode promoCode = promoCodeList.get(0);
promoCode.setPromoCodeStatus(true); promoCode.setPromoCodeStatus(true);
@ -105,7 +105,7 @@ public class PromoCodeApplyController {
// 更新项目的推广人数 // 更新项目的推广人数
Map<SFunction<UserProject, ?>, Object> projectConditions = Map.of(UserProject::getProjectId, projectId, UserProject::getUserId, userId); Map<SFunction<UserProject, ?>, Object> projectConditions = Map.of(UserProject::getProjectId, projectId, UserProject::getUserId, userId);
List<UserProject> userProjectList = commonService.findByFieldEqTargetFields(projectConditions, userProjectService); List<UserProject> userProjectList = commonService.findByFieldEqTargetFieldsWithSpecificColumns(projectConditions, userProjectService, List.of(UserProject::getId));
if (userProjectList.isEmpty()) project.setCurrentPromotionCount(project.getCurrentPromotionCount() + 1); if (userProjectList.isEmpty()) project.setCurrentPromotionCount(project.getCurrentPromotionCount() + 1);
projectService.updateById(project); projectService.updateById(project);
@ -154,7 +154,7 @@ public class PromoCodeApplyController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询推广码申请记录", description = "参数：推广码申请记录查询请求体，权限：管理员，方法名：listPromoCodeApplyByPage") @Operation(summary = "Web端管理员分页查询推广码申请记录", description = "参数：推广码申请记录查询请求体，权限：管理员，方法名：listPromoCodeApplyByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码申请记录管理", content = "Web端管理员分页查询推广码申请记录") // @SysLog(title = "推广码申请记录管理", content = "Web端管理员分页查询推广码申请记录")
public BaseResponse<Page<PromoCodeApplyVO>> listPromoCodeApplyByPage(@Valid @RequestBody PromoCodeApplyQueryRequest promoCodeApplyQueryRequest) { public BaseResponse<Page<PromoCodeApplyVO>> listPromoCodeApplyByPage(@Valid @RequestBody PromoCodeApplyQueryRequest promoCodeApplyQueryRequest) {
long current = promoCodeApplyQueryRequest.getCurrent(); long current = promoCodeApplyQueryRequest.getCurrent();
long pageSize = promoCodeApplyQueryRequest.getPageSize(); long pageSize = promoCodeApplyQueryRequest.getPageSize();

12
src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java
View File

@ -63,7 +63,7 @@ public class PromoCodeController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "web端管理员添加推广码", description = "参数：推广码添加请求体，权限：管理员，方法名：addPromoCode") @Operation(summary = "web端管理员添加推广码", description = "参数：推广码添加请求体，权限：管理员，方法名：addPromoCode")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码管理", content = "web端管理员添加推广码") // @SysLog(title = "推广码管理", content = "web端管理员添加推广码")
public BaseResponse<Boolean> addPromoCode(@Valid @RequestBody PromoCodeAddRequest promoCodeAddRequest) { public BaseResponse<Boolean> addPromoCode(@Valid @RequestBody PromoCodeAddRequest promoCodeAddRequest) {
Long proId = promoCodeAddRequest.getProjectId(); Long proId = promoCodeAddRequest.getProjectId();
Project pro = projectService.getById(proId); Project pro = projectService.getById(proId);
@ -81,7 +81,7 @@ public class PromoCodeController {
@PostMapping("update") @PostMapping("update")
@Operation(summary = "web端管理员更新推广码", description = "参数：推广码更新请求体，权限：管理员，方法名：updatePromoCode") @Operation(summary = "web端管理员更新推广码", description = "参数：推广码更新请求体，权限：管理员，方法名：updatePromoCode")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码管理", content = "web端管理员根据id修改推广码信息") // @SysLog(title = "推广码管理", content = "web端管理员根据id修改推广码信息")
public BaseResponse<Boolean> updatePromoCode(@Valid @RequestBody PromoCodeUpdateRequest promoCodeUpdateRequest) { public BaseResponse<Boolean> updatePromoCode(@Valid @RequestBody PromoCodeUpdateRequest promoCodeUpdateRequest) {
PromoCode promoCode = commonService.copyProperties(promoCodeUpdateRequest, PromoCode.class); PromoCode promoCode = commonService.copyProperties(promoCodeUpdateRequest, PromoCode.class);
promoCodeService.updateById(promoCode); promoCodeService.updateById(promoCode);
@ -96,7 +96,7 @@ public class PromoCodeController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除推广码", description = "参数：推广码删除请求体，权限：管理员，方法名：delPromoCode") @Operation(summary = "web端管理员根据id删除推广码", description = "参数：推广码删除请求体，权限：管理员，方法名：delPromoCode")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码管理", content = "web端管理员根据id删除推广码") // @SysLog(title = "推广码管理", content = "web端管理员根据id删除推广码")
public BaseResponse<Boolean> delPromoCode(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delPromoCode(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
PromoCode promoCode = promoCodeService.getById(id); PromoCode promoCode = promoCodeService.getById(id);
@ -114,7 +114,7 @@ public class PromoCodeController {
@PostMapping("delBatch") @PostMapping("delBatch")
@Operation(summary = "web端管理员批量删除推广码", description = "参数：推广码批量删除请求体，权限：管理员，方法名：delBatchPromoCode") @Operation(summary = "web端管理员批量删除推广码", description = "参数：推广码批量删除请求体，权限：管理员，方法名：delBatchPromoCode")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码管理", content = "web端管理员批量删除推广码") // @SysLog(title = "推广码管理", content = "web端管理员批量删除推广码")
public BaseResponse<Boolean> delBatchPromoCode(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { public BaseResponse<Boolean> delBatchPromoCode(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
promoCodeService.delBatchPromoCode(commonBatchRequest); promoCodeService.delBatchPromoCode(commonBatchRequest);
return ResultUtils.success(true); return ResultUtils.success(true);
@ -128,7 +128,7 @@ public class PromoCodeController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询推广码", description = "参数：推广码查询请求体，权限：管理员，方法名：queryPromoCodeById") @Operation(summary = "web端管理员根据id查询推广码", description = "参数：推广码查询请求体，权限：管理员，方法名：queryPromoCodeById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码管理", content = "web端管理员根据id查询推广码") // @SysLog(title = "推广码管理", content = "web端管理员根据id查询推广码")
public BaseResponse<PromoCodeVO> queryPromoCodeById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<PromoCodeVO> queryPromoCodeById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
PromoCode promoCode = promoCodeService.getById(id); PromoCode promoCode = promoCodeService.getById(id);
@ -146,7 +146,7 @@ public class PromoCodeController {
@PostMapping("queryByPid") @PostMapping("queryByPid")
@Operation(summary = "web端管理员根据id查询推广码", description = "参数：项目id，权限：管理员，方法名：queryPromoCodeByPid") @Operation(summary = "web端管理员根据id查询推广码", description = "参数：项目id，权限：管理员，方法名：queryPromoCodeByPid")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码") // @SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码")
public BaseResponse<List<PromoCodeVO>> queryPromoCodeByPid(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<List<PromoCodeVO>> queryPromoCodeByPid(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
LambdaQueryWrapper<PromoCode> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PromoCode> lambdaQueryWrapper = new LambdaQueryWrapper<>();

17
src/main/java/com/greenorange/promotion/controller/projectSettlement/ProjectSettlementController.java
View File

@ -90,7 +90,8 @@ public class ProjectSettlementController {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
Map<SFunction<ProjectSettlement, ?>, Object> fieldConditions = Map.of(ProjectSettlement::getPromoCodeApplyId, id); Map<SFunction<ProjectSettlement, ?>, Object> fieldConditions = Map.of(ProjectSettlement::getPromoCodeApplyId, id);
List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService); List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService);
List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetField(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId); List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetFieldWithSpecificFields(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId,
List.of(PromoCodeApply::getId, PromoCodeApply::getSalespersonName));
// 封装Map集合（键：推广码申请记录id, 值：业务员姓名） // 封装Map集合（键：推广码申请记录id, 值：业务员姓名）
Map<Long, String> salespersonNameMap = new HashMap<>(); Map<Long, String> salespersonNameMap = new HashMap<>();
for (PromoCodeApply promoCodeApply : promoCodeApplyList) { for (PromoCodeApply promoCodeApply : promoCodeApplyList) {
@ -119,7 +120,8 @@ public class ProjectSettlementController {
Long userId = (Long) request.getAttribute("userId"); Long userId = (Long) request.getAttribute("userId");
Map<SFunction<ProjectSettlement, ?>, Object> fieldConditions = Map.of(ProjectSettlement::getUserId, userId, ProjectSettlement::getProjectId, projectId); Map<SFunction<ProjectSettlement, ?>, Object> fieldConditions = Map.of(ProjectSettlement::getUserId, userId, ProjectSettlement::getProjectId, projectId);
List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService); List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetFields(fieldConditions, projectSettlementService);
List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetField(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId); List<PromoCodeApply> promoCodeApplyList = commonService.findByFieldInTargetFieldWithSpecificFields(projectSettlementList, promoCodeApplyService, ProjectSettlement::getPromoCodeApplyId, PromoCodeApply::getId,
List.of(PromoCodeApply::getId, PromoCodeApply::getSalespersonName));
// 封装Map集合（键：推广码申请记录id, 值：业务员姓名） // 封装Map集合（键：推广码申请记录id, 值：业务员姓名）
Map<Long, String> salespersonNameMap = new HashMap<>(); Map<Long, String> salespersonNameMap = new HashMap<>();
for (PromoCodeApply promoCodeApply : promoCodeApplyList) { for (PromoCodeApply promoCodeApply : promoCodeApplyList) {
@ -143,7 +145,7 @@ public class ProjectSettlementController {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Operation(summary = "web端管理员添加项目结算记录", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：addProjectSettlement") @Operation(summary = "web端管理员添加项目结算记录", description = "参数：项目结算记录添加请求体，权限：管理员，方法名：addProjectSettlement")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目结算记录管理", content = "web端管理员添加项目结算记录") // @SysLog(title = "项目结算记录管理", content = "web端管理员添加项目结算记录")
public BaseResponse<Boolean> addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) { public BaseResponse<Boolean> addProjectSettlement(@Valid @RequestBody ProjectSettlementAddRequest projectSettlementAddRequest) {
// 添加当前用户的项目结算记录 // 添加当前用户的项目结算记录
ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class); ProjectSettlement projectSettlement = commonService.copyProperties(projectSettlementAddRequest, ProjectSettlement.class);
@ -210,7 +212,8 @@ public class ProjectSettlementController {
fundsChangeService.save(fundsChange); fundsChangeService.save(fundsChange);
// 获取用户主要信息 // 获取用户主要信息
List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetField(pathToRoot, userMainInfoService, Function.identity(), UserMainInfo::getUserId); List<UserMainInfo> userMainInfoList = commonService.findByFieldInTargetFieldWithSpecificFields(pathToRoot, userMainInfoService, Function.identity(), UserMainInfo::getUserId,
List.of(UserMainInfo::getUserId, UserMainInfo::getCurrentBalance));
// 封装Map集合（键：用户id，值：用户余额） // 封装Map集合（键：用户id，值：用户余额）
Map<Long, BigDecimal> userMainInfoMap = new HashMap<>(); Map<Long, BigDecimal> userMainInfoMap = new HashMap<>();
for (UserMainInfo mainInfo : userMainInfoList) { for (UserMainInfo mainInfo : userMainInfoList) {
@ -271,7 +274,7 @@ public class ProjectSettlementController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除项目结算记录", description = "参数：项目结算记录删除请求体，权限：管理员，方法名：delProjectSettlement") @Operation(summary = "web端管理员根据id删除项目结算记录", description = "参数：项目结算记录删除请求体，权限：管理员，方法名：delProjectSettlement")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目结算记录管理", content = "web端管理员根据id删除项目结算记录") // @SysLog(title = "项目结算记录管理", content = "web端管理员根据id删除项目结算记录")
public BaseResponse<Boolean> delProjectSettlement(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delProjectSettlement(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
projectSettlementService.removeById(id); projectSettlementService.removeById(id);
@ -304,7 +307,7 @@ public class ProjectSettlementController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询项目结算记录", description = "参数：项目结算记录查询请求体，权限：管理员，方法名：queryProjectSettlementById") @Operation(summary = "web端管理员根据id查询项目结算记录", description = "参数：项目结算记录查询请求体，权限：管理员，方法名：queryProjectSettlementById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目结算记录管理", content = "web端管理员根据id查询项目结算记录") // @SysLog(title = "项目结算记录管理", content = "web端管理员根据id查询项目结算记录")
public BaseResponse<ProjectSettlementVO> queryProjectSettlementById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<ProjectSettlementVO> queryProjectSettlementById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
ProjectSettlement projectSettlement = projectSettlementService.getById(id); ProjectSettlement projectSettlement = projectSettlementService.getById(id);
@ -321,7 +324,7 @@ public class ProjectSettlementController {
@PostMapping("queryByPId") @PostMapping("queryByPId")
@Operation(summary = "Web端管理员根据推广码申请记录id查询项目结算记录列表", description = "参数：推广码申请记录id，权限：管理员，方法名：queryProjectSettlementByPid") @Operation(summary = "Web端管理员根据推广码申请记录id查询项目结算记录列表", description = "参数：推广码申请记录id，权限：管理员，方法名：queryProjectSettlementByPid")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "项目结算记录管理", content = "Web端管理员根据推广码申请记录id查询项目结算记录列表") // @SysLog(title = "项目结算记录管理", content = "Web端管理员根据推广码申请记录id查询项目结算记录列表")
public BaseResponse<List<ProjectSettlementVO>> queryProjectSettlementByPid(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<List<ProjectSettlementVO>> queryProjectSettlementByPid(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetField(ProjectSettlement::getPromoCodeApplyId, id, projectSettlementService); List<ProjectSettlement> projectSettlementList = commonService.findByFieldEqTargetField(ProjectSettlement::getPromoCodeApplyId, id, projectSettlementService);

2
src/main/java/com/greenorange/promotion/controller/projectSettlement/WithdrawalApplyController.java
View File

@ -181,7 +181,7 @@ public class WithdrawalApplyController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询提现申请记录", description = "参数：提现申请记录查询请求体，权限：管理员，方法名：listWithdrawalApplyByPage") @Operation(summary = "Web端管理员分页查询提现申请记录", description = "参数：提现申请记录查询请求体，权限：管理员，方法名：listWithdrawalApplyByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录") // @SysLog(title = "提现申请记录管理", content = "Web端管理员分页查询提现申请记录")
public BaseResponse<Page<WithdrawalApplyVO>> listWithdrawalApplyByPage(@Valid @RequestBody WithdrawalApplyQueryRequest withdrawalApplyQueryRequest) { public BaseResponse<Page<WithdrawalApplyVO>> listWithdrawalApplyByPage(@Valid @RequestBody WithdrawalApplyQueryRequest withdrawalApplyQueryRequest) {
long current = withdrawalApplyQueryRequest.getCurrent(); long current = withdrawalApplyQueryRequest.getCurrent();
long pageSize = withdrawalApplyQueryRequest.getPageSize(); long pageSize = withdrawalApplyQueryRequest.getPageSize();

14
src/main/java/com/greenorange/promotion/controller/userInfo/AdvancementApplyController.java
View File

@ -66,7 +66,7 @@ public class AdvancementApplyController {
*/ */
@PostMapping("add") @PostMapping("add")
@Operation(summary = "小程序端用户申请晋升", description = "参数：晋升申请添加请求体，权限：管理员，方法名：addAdvancementApply") @Operation(summary = "小程序端用户申请晋升", description = "参数：晋升申请添加请求体，权限：管理员，方法名：addAdvancementApply")
@SysLog(title = "晋升申请管理", content = "小程序端用户申请晋升") // @SysLog(title = "晋升申请管理", content = "小程序端用户申请晋升")
public BaseResponse<Long> addAdvancementApply(@Valid @RequestBody AdvancementApplyAddRequest advancementApplyAddRequest) { public BaseResponse<Long> addAdvancementApply(@Valid @RequestBody AdvancementApplyAddRequest advancementApplyAddRequest) {
String phone = advancementApplyAddRequest.getPhone(); String phone = advancementApplyAddRequest.getPhone();
String verificationCode = advancementApplyAddRequest.getVerificationCode(); String verificationCode = advancementApplyAddRequest.getVerificationCode();
@ -94,7 +94,7 @@ public class AdvancementApplyController {
*/ */
@PostMapping("modify/status") @PostMapping("modify/status")
@Operation(summary = "小程序端用户撤销晋升申请记录", description = "参数：晋升申请记录id，权限：管理员，方法名：revokeAdvancementApply") @Operation(summary = "小程序端用户撤销晋升申请记录", description = "参数：晋升申请记录id，权限：管理员，方法名：revokeAdvancementApply")
@SysLog(title = "晋升申请管理", content = "小程序端用户撤销晋升申请记录") // @SysLog(title = "晋升申请管理", content = "小程序端用户撤销晋升申请记录")
public BaseResponse<Boolean> revokeAdvancementApply(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> revokeAdvancementApply(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
LambdaUpdateWrapper<AdvancementApply> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<AdvancementApply> updateWrapper = new LambdaUpdateWrapper<>();
@ -162,7 +162,7 @@ public class AdvancementApplyController {
@PostMapping("approve") @PostMapping("approve")
@Operation(summary = "web端管理员批准用户的晋升申请", description = "参数：晋升申请id，权限：管理员，方法名：approveAdvancementApply") @Operation(summary = "web端管理员批准用户的晋升申请", description = "参数：晋升申请id，权限：管理员，方法名：approveAdvancementApply")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "晋升申请管理", content = "web端管理员批准用户的晋升申请") // @SysLog(title = "晋升申请管理", content = "web端管理员批准用户的晋升申请")
public BaseResponse<Boolean> approveAdvancementApply(@Valid @RequestBody AdvancementApplyApproveRequest advancementApplyApproveRequest) { public BaseResponse<Boolean> approveAdvancementApply(@Valid @RequestBody AdvancementApplyApproveRequest advancementApplyApproveRequest) {
userInfoService.staffUserInfoMiniRegister(advancementApplyApproveRequest); userInfoService.staffUserInfoMiniRegister(advancementApplyApproveRequest);
return ResultUtils.success(true); return ResultUtils.success(true);
@ -177,7 +177,7 @@ public class AdvancementApplyController {
@PostMapping("reject") @PostMapping("reject")
@Operation(summary = "web端管理员拒绝晋升申请", description = "参数：晋升申请拒绝请求体，权限：管理员，方法名：rejectAdvancementApply") @Operation(summary = "web端管理员拒绝晋升申请", description = "参数：晋升申请拒绝请求体，权限：管理员，方法名：rejectAdvancementApply")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "晋升申请管理", content = "web端管理员拒绝晋升申请") // @SysLog(title = "晋升申请管理", content = "web端管理员拒绝晋升申请")
public BaseResponse<Boolean> rejectAdvancementApply(@Valid @RequestBody AdvancementApplyRejectRequest advancementApplyRejectRequest) { public BaseResponse<Boolean> rejectAdvancementApply(@Valid @RequestBody AdvancementApplyRejectRequest advancementApplyRejectRequest) {
Long applyId = advancementApplyRejectRequest.getApplyId(); Long applyId = advancementApplyRejectRequest.getApplyId();
String rejectReason = advancementApplyRejectRequest.getRejectReason(); String rejectReason = advancementApplyRejectRequest.getRejectReason();
@ -198,7 +198,7 @@ public class AdvancementApplyController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询晋升申请", description = "参数：晋升申请id，权限：管理员，方法名：queryAdvancementApplyById") @Operation(summary = "web端管理员根据id查询晋升申请", description = "参数：晋升申请id，权限：管理员，方法名：queryAdvancementApplyById")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "晋升申请管理", content = "web端管理员根据id查询晋升申请") // @SysLog(title = "晋升申请管理", content = "web端管理员根据id查询晋升申请")
public BaseResponse<AdvancementApplyVOPlus> queryAdvancementApplyById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<AdvancementApplyVOPlus> queryAdvancementApplyById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
AdvancementApply advancementApply = advancementApplyService.getById(id); AdvancementApply advancementApply = advancementApplyService.getById(id);
@ -215,7 +215,7 @@ public class AdvancementApplyController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询晋升申请", description = "参数：晋升申请查询请求体，权限：管理员，方法名：listAdvancementApplyByPage") @Operation(summary = "Web端管理员分页查询晋升申请", description = "参数：晋升申请查询请求体，权限：管理员，方法名：listAdvancementApplyByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请") // @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请")
public BaseResponse<Page<AdvancementApplyVO>> listAdvancementApplyByPage(@Valid @RequestBody AdvancementApplyQueryRequest advancementApplyQueryRequest) { public BaseResponse<Page<AdvancementApplyVO>> listAdvancementApplyByPage(@Valid @RequestBody AdvancementApplyQueryRequest advancementApplyQueryRequest) {
long current = advancementApplyQueryRequest.getCurrent(); long current = advancementApplyQueryRequest.getCurrent();
long pageSize = advancementApplyQueryRequest.getPageSize(); long pageSize = advancementApplyQueryRequest.getPageSize();
@ -238,7 +238,7 @@ public class AdvancementApplyController {
@PostMapping("query/supervisor") @PostMapping("query/supervisor")
@Operation(summary = "Web端管理员查询主管信息列表", description = "参数：无，权限：管理员，方法名：listSupervisorUserInfo") @Operation(summary = "Web端管理员查询主管信息列表", description = "参数：无，权限：管理员，方法名：listSupervisorUserInfo")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请") // @SysLog(title = "晋升申请管理", content = "Web端管理员分页查询晋升申请")
public BaseResponse<List<SupervisorUserInfoVO>> listSupervisorUserInfo() { public BaseResponse<List<SupervisorUserInfoVO>> listSupervisorUserInfo() {
List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE, userInfoService); List<UserInfo> userInfoList = commonService.findByFieldEqTargetField(UserInfo::getUserRole, UserConstant.SUPERVISOR_ROLE, userInfoService);
List<SupervisorUserInfoVO> supervisorUserInfoVOS = commonService.convertList(userInfoList, SupervisorUserInfoVO.class); List<SupervisorUserInfoVO> supervisorUserInfoVOS = commonService.convertList(userInfoList, SupervisorUserInfoVO.class);

16
src/main/java/com/greenorange/promotion/controller/userInfo/UserInfoController.java
View File

@ -405,7 +405,7 @@ public class UserInfoController {
*/ */
@PostMapping("login") @PostMapping("login")
@Operation(summary = "web端管理员登录", description = "参数：web用户登录请求体，权限：管理员（boss, admin)，方法名：userInfoLogin") @Operation(summary = "web端管理员登录", description = "参数：web用户登录请求体，权限：管理员（boss, admin)，方法名：userInfoLogin")
@SysLog(title = "用户管理", content = "web端管理员登录") // @SysLog(title = "用户管理", content = "web端管理员登录")
public BaseResponse<String> userInfoLogin(@Valid @RequestBody UserInfoLoginRequest userInfoLoginRequest) { public BaseResponse<String> userInfoLogin(@Valid @RequestBody UserInfoLoginRequest userInfoLoginRequest) {
String token = userInfoService.userInfoLogin(userInfoLoginRequest); String token = userInfoService.userInfoLogin(userInfoLoginRequest);
return ResultUtils.success(token); return ResultUtils.success(token);
@ -421,7 +421,7 @@ public class UserInfoController {
@GetMapping("logout") @GetMapping("logout")
@Operation(summary = "web端管理员退出登录", description = "参数：JWT，权限：管理员（boss, admin)，方法名：userInfoLogout") @Operation(summary = "web端管理员退出登录", description = "参数：JWT，权限：管理员（boss, admin)，方法名：userInfoLogout")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户管理", content = "web端管理员退出登录") // @SysLog(title = "用户管理", content = "web端管理员退出登录")
public BaseResponse<Boolean> userInfoLogout(@RequestHeader("Authorization") String token) { public BaseResponse<Boolean> userInfoLogout(@RequestHeader("Authorization") String token) {
// 获取token的过期时间 // 获取token的过期时间
DecodedJWT decodedJWT = jwtUtils.verify(token); DecodedJWT decodedJWT = jwtUtils.verify(token);
@ -444,7 +444,7 @@ public class UserInfoController {
@PostMapping("add") @PostMapping("add")
@Operation(summary = "web端管理员添加用户", description = "参数：用户表添加请求体，权限：管理员（boss, admin)，方法名：addUserInfo") @Operation(summary = "web端管理员添加用户", description = "参数：用户表添加请求体，权限：管理员（boss, admin)，方法名：addUserInfo")
@RequiresPermission(mustRole = UserConstant.BOSS_ROLE) @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
@SysLog(title = "用户管理", content = "web端管理员添加用户") // @SysLog(title = "用户管理", content = "web端管理员添加用户")
public BaseResponse<Boolean> addUserInfo(@Valid @RequestBody UserInfoAddRequest userInfoAddRequest) { public BaseResponse<Boolean> addUserInfo(@Valid @RequestBody UserInfoAddRequest userInfoAddRequest) {
UserInfo userInfo = commonService.copyProperties(userInfoAddRequest, UserInfo.class); UserInfo userInfo = commonService.copyProperties(userInfoAddRequest, UserInfo.class);
userInfo.setParentUserId(-1L); userInfo.setParentUserId(-1L);
@ -463,7 +463,7 @@ public class UserInfoController {
@PostMapping("update") @PostMapping("update")
@Operation(summary = "web端管理员更新用户", description = "参数：用户表更新请求体，权限：管理员（boss, admin)，方法名：updateUserInfo") @Operation(summary = "web端管理员更新用户", description = "参数：用户表更新请求体，权限：管理员（boss, admin)，方法名：updateUserInfo")
@RequiresPermission(mustRole = UserConstant.BOSS_ROLE) @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
@SysLog(title = "用户管理", content = "web端管理员根据id修改用户信息") // @SysLog(title = "用户管理", content = "web端管理员根据id修改用户信息")
public BaseResponse<Boolean> updateUserInfo(@Valid @RequestBody UserInfoUpdateRequest userInfoUpdateRequest) { public BaseResponse<Boolean> updateUserInfo(@Valid @RequestBody UserInfoUpdateRequest userInfoUpdateRequest) {
UserInfo userInfo = commonService.copyProperties(userInfoUpdateRequest, UserInfo.class); UserInfo userInfo = commonService.copyProperties(userInfoUpdateRequest, UserInfo.class);
userInfoService.updateById(userInfo); userInfoService.updateById(userInfo);
@ -479,7 +479,7 @@ public class UserInfoController {
@PostMapping("delete") @PostMapping("delete")
@Operation(summary = "web端管理员根据id删除用户", description = "参数：用户表删除请求体，权限：管理员（boss, admin)，方法名：delUserInfo") @Operation(summary = "web端管理员根据id删除用户", description = "参数：用户表删除请求体，权限：管理员（boss, admin)，方法名：delUserInfo")
@RequiresPermission(mustRole = UserConstant.BOSS_ROLE) @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
@SysLog(title = "用户管理", content = "web端管理员根据id删除用户表") // @SysLog(title = "用户管理", content = "web端管理员根据id删除用户表")
public BaseResponse<Boolean> delUserInfo(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<Boolean> delUserInfo(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
userInfoService.removeById(id); userInfoService.removeById(id);
@ -496,7 +496,7 @@ public class UserInfoController {
@PostMapping("delBatch") @PostMapping("delBatch")
@Operation(summary = "web端管理员批量删除用户", description = "参数：用户表批量删除请求体，权限：管理员（boss, admin)，方法名:delBatchUserInfo") @Operation(summary = "web端管理员批量删除用户", description = "参数：用户表批量删除请求体，权限：管理员（boss, admin)，方法名:delBatchUserInfo")
@RequiresPermission(mustRole = UserConstant.BOSS_ROLE) @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
@SysLog(title = "用户管理", content = "web端管理员批量删除用户表") // @SysLog(title = "用户管理", content = "web端管理员批量删除用户表")
public BaseResponse<Boolean> delBatchUserInfo(@Valid @RequestBody CommonBatchRequest commonBatchRequest) { public BaseResponse<Boolean> delBatchUserInfo(@Valid @RequestBody CommonBatchRequest commonBatchRequest) {
List<Long> ids = commonBatchRequest.getIds(); List<Long> ids = commonBatchRequest.getIds();
userInfoService.removeByIds(ids); userInfoService.removeByIds(ids);
@ -514,7 +514,7 @@ public class UserInfoController {
@PostMapping("queryById") @PostMapping("queryById")
@Operation(summary = "web端管理员根据id查询用户", description = "参数：用户表查询请求体，权限：管理员（boss, admin)，方法名:queryUserInfoById") @Operation(summary = "web端管理员根据id查询用户", description = "参数：用户表查询请求体，权限：管理员（boss, admin)，方法名:queryUserInfoById")
@RequiresPermission(mustRole = UserConstant.BOSS_ROLE) @RequiresPermission(mustRole = UserConstant.BOSS_ROLE)
@SysLog(title = "用户管理", content = "web端管理员根据id查询用户") // @SysLog(title = "用户管理", content = "web端管理员根据id查询用户")
public BaseResponse<UserInfoVO> queryUserInfoById(@Valid @RequestBody CommonRequest commonRequest) { public BaseResponse<UserInfoVO> queryUserInfoById(@Valid @RequestBody CommonRequest commonRequest) {
Long id = commonRequest.getId(); Long id = commonRequest.getId();
UserInfo userInfo = userInfoService.getById(id); UserInfo userInfo = userInfoService.getById(id);
@ -534,7 +534,7 @@ public class UserInfoController {
@PostMapping("page") @PostMapping("page")
@Operation(summary = "Web端管理员分页查询用户", description = "参数：用户表查询请求体，权限：管理员（boss, admin)，方法名:listUserInfoByPage") @Operation(summary = "Web端管理员分页查询用户", description = "参数：用户表查询请求体，权限：管理员（boss, admin)，方法名:listUserInfoByPage")
@RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
@SysLog(title = "用户管理", content = "Web端管理员分页查看用户") // @SysLog(title = "用户管理", content = "Web端管理员分页查看用户")
public BaseResponse<Page<UserInfoVO>> listUserInfoByPage(@Valid @RequestBody UserInfoQueryRequest userInfoQueryRequest) { public BaseResponse<Page<UserInfoVO>> listUserInfoByPage(@Valid @RequestBody UserInfoQueryRequest userInfoQueryRequest) {
long current = userInfoQueryRequest.getCurrent(); long current = userInfoQueryRequest.getCurrent();
long pageSize = userInfoQueryRequest.getPageSize(); long pageSize = userInfoQueryRequest.getPageSize();

124
src/main/java/com/greenorange/promotion/controller/wechat/WechatPayoutsController.java
View File

@ -1,62 +1,62 @@
package com.greenorange.promotion.controller.wechat; //package com.greenorange.promotion.controller.wechat;
//
//
import cn.hutool.http.HttpUtil; //import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil; //import cn.hutool.json.JSONUtil;
import com.greenorange.promotion.common.BaseResponse; //import com.greenorange.promotion.common.BaseResponse;
import com.greenorange.promotion.common.ResultUtils; //import com.greenorange.promotion.common.ResultUtils;
import com.greenorange.promotion.utils.OrderNumberUtils; //import com.greenorange.promotion.utils.OrderNumberUtils;
import io.swagger.v3.oas.annotations.Hidden; //import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.Operation; //import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; //import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest; //import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional; //import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.PostMapping; //import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
//
import java.io.IOException; //import java.io.IOException;
import java.util.HashMap; //import java.util.HashMap;
import java.util.Map; //import java.util.Map;
//
@Slf4j //@Slf4j
@RestController //@RestController
@Tag(name = "微信提现模块") //@Tag(name = "微信提现模块")
@RequestMapping("/payouts") //@RequestMapping("/payouts")
@Transactional //@Transactional
public class WechatPayoutsController { //public class WechatPayoutsController {
//
//
/** // /**
* 微信小程序积分提现到银行卡 // * 微信小程序积分提现到银行卡
*/ // */
@Hidden // @Hidden
@PostMapping("/points") // @PostMapping("/points")
@Operation(summary = "微信小程序积分提现到银行卡", description = "参数：无, 权限：所有人, 方法名：getQrcode") // @Operation(summary = "微信小程序积分提现到银行卡", description = "参数：无, 权限：所有人, 方法名：getQrcode")
public BaseResponse<Boolean> pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException { // public BaseResponse<Boolean> pointsWithdrawnToBankCard(HttpServletRequest request) throws IOException {
Map<String, Object> param = new HashMap<>(); // Map<String, Object> param = new HashMap<>();
param.put("mch_id", "1700326544"); // param.put("mch_id", "1700326544");
param.put("partner_trade_no", OrderNumberUtils.generateOrderId()); // param.put("partner_trade_no", OrderNumberUtils.generateOrderId());
param.put("nonce_str", "fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t"); // param.put("nonce_str", "fbemuj4Xql7CYlQJAoTEPYxvPSNgYT2t");
param.put("sign", ""); // param.put("sign", "");
param.put("enc_bank_no", "6222031207006363442"); // param.put("enc_bank_no", "6222031207006363442");
param.put("enc_true_name", "陈新知"); // param.put("enc_true_name", "陈新知");
param.put("bank_code", "1002"); // param.put("bank_code", "1002");
param.put("amount", 5); // param.put("amount", 5);
param.put("desc", "提现"); // param.put("desc", "提现");
String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank"; // String url = "https://api.mch.weixin.qq.com/mmpaysptrans/pay_bank";
String jsonParams = JSONUtil.toJsonStr(param); // String jsonParams = JSONUtil.toJsonStr(param);
String response = HttpUtil.createPost(url) // String response = HttpUtil.createPost(url)
.header("Content-Type", "application/json") // .header("Content-Type", "application/json")
.body(jsonParams) // .body(jsonParams)
.execute() // .execute()
.body(); // .body();
//
return ResultUtils.success(true); // return ResultUtils.success(true);
} // }
//
//
//
//
} //}

3
src/main/java/com/greenorange/promotion/service/project/impl/ProjectServiceImpl.java
View File

@ -72,7 +72,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project>
Long userId = (Long) request.getAttribute("userId"); Long userId = (Long) request.getAttribute("userId");
// 获取项目明细抽佣列表 // 获取项目明细抽佣列表
List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, userId, projectCommissionService); List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetFieldWithSpecificFields(
ProjectCommission::getUserId, userId, projectCommissionService, List.of(ProjectCommission::getProjectId, ProjectCommission::getMyUnitPrice));
// 封装Map集合（键：项目id, 值：项目总价） // 封装Map集合（键：项目id, 值：项目总价）
Map<Long, BigDecimal> projectPriceMap = new HashMap<>(); Map<Long, BigDecimal> projectPriceMap = new HashMap<>();
for (ProjectCommission projectCommission : projectCommissionList) { for (ProjectCommission projectCommission : projectCommissionList) {

7
src/main/java/com/greenorange/promotion/service/userInfo/impl/UserInfoServiceImpl.java
View File

@ -226,8 +226,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
UserMainInfo userMainInfo = UserMainInfo.builder().userId(myUserInfo.getId()).inviteQrCode(invitationQrcode).build(); UserMainInfo userMainInfo = UserMainInfo.builder().userId(myUserInfo.getId()).inviteQrCode(invitationQrcode).build();
userMainInfoService.save(userMainInfo); userMainInfoService.save(userMainInfo);
// // 批量保存当前用户的项目明细抽佣记录和下级用户项目明细抽佣记录 // 批量保存当前用户的项目明细抽佣记录和下级用户项目明细抽佣记录
// saveBatchProjectCommissionAndSubUserProjectCommission(myUserInfo.getId(), parentUserInfo.getId()); saveBatchProjectCommissionAndSubUserProjectCommission(myUserInfo.getId(), parentUserInfo.getId());
} }
@ -568,7 +568,8 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo>
List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserId, projectCommissionService); List<ProjectCommission> projectCommissionList = commonService.findByFieldEqTargetField(ProjectCommission::getUserId, parentUserId, projectCommissionService);
// 封装Map集合（键：项目明细id, 值：项目最小价格） // 封装Map集合（键：项目明细id, 值：项目最小价格）
Map<Long, BigDecimal> projectDetailMinPriceMap = new HashMap<>(); Map<Long, BigDecimal> projectDetailMinPriceMap = new HashMap<>();
List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetField(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId); List<ProjectDetail> projectDetailList = commonService.findByFieldInTargetFieldWithSpecificFields(projectCommissionList, projectDetailService, ProjectCommission::getProjectDetailId, ProjectDetail::getId,
List.of(ProjectDetail::getId, ProjectDetail::getProjectMinSettlementPrice));
for (ProjectDetail projectDetail : projectDetailList) { for (ProjectDetail projectDetail : projectDetailList) {
projectDetailMinPriceMap.put(projectDetail.getId(), projectDetail.getProjectMinSettlementPrice()); projectDetailMinPriceMap.put(projectDetail.getId(), projectDetail.getProjectMinSettlementPrice());
} }

2
src/main/resources/application.yml
View File

@ -1,4 +1,4 @@
spring: spring:
profiles: profiles:
active: prod active: test