From 6e9a542d15725d743e0d38da4a2bba379913a4c0 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Sat, 10 May 2025 17:49:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=98=8E=E7=BB=86=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/project/ProjectController.java | 40 ++++++++++++++++--- .../ProjectDetailController.java | 3 -- 2 files changed, 34 insertions(+), 9 deletions(-) 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 dc31c38..53956f5 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java @@ -1,5 +1,6 @@ package com.greenorange.promotion.controller.project; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -20,15 +21,11 @@ import com.greenorange.promotion.model.dto.project.ProjectStatusUpdateRequest; import com.greenorange.promotion.model.dto.project.ProjectUpdateRequest; import com.greenorange.promotion.model.dto.projectDetail.ProjectDetailAddRequest; import com.greenorange.promotion.model.dto.projectNotification.ProjectNotificationAddRequest; -import com.greenorange.promotion.model.entity.Project; -import com.greenorange.promotion.model.entity.ProjectDetail; -import com.greenorange.promotion.model.entity.ProjectNotification; +import com.greenorange.promotion.model.entity.*; import com.greenorange.promotion.model.vo.project.ProjectPageVO; import com.greenorange.promotion.model.vo.project.ProjectVO; import com.greenorange.promotion.service.common.CommonService; -import com.greenorange.promotion.service.project.ProjectDetailService; -import com.greenorange.promotion.service.project.ProjectNotificationService; -import com.greenorange.promotion.service.project.ProjectService; +import com.greenorange.promotion.service.project.*; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -57,6 +54,22 @@ public class ProjectController { @Resource private CommonService commonService; + @Resource + private ProjectDetailService projectDetailService; + + @Resource + private ProjectNotificationService projectNotificationService; + + @Resource + private PromoCodeService promoCodeService; + + @Resource + private ProjectCommissionService projectCommissionService; + + @Resource + private SubUserProjectCommissionService subUserProjectCommissionService; + + /** * web端管理员添加项目 * @param projectAddRequest 项目添加请求体 @@ -99,6 +112,21 @@ public class ProjectController { public BaseResponse delProject(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); projectService.removeById(id); + LambdaQueryWrapper projectDetailLambdaQueryWrapper = new LambdaQueryWrapper<>(); + projectDetailLambdaQueryWrapper.eq(ProjectDetail::getProjectId, id); + projectDetailService.remove(projectDetailLambdaQueryWrapper); + LambdaQueryWrapper projectNotificationLambdaQueryWrapper = new LambdaQueryWrapper<>(); + projectNotificationLambdaQueryWrapper.eq(ProjectNotification::getProjectId, id); + projectNotificationService.remove(projectNotificationLambdaQueryWrapper); + LambdaQueryWrapper promoCodeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + promoCodeLambdaQueryWrapper.eq(PromoCode::getProjectId, id); + promoCodeService.remove(promoCodeLambdaQueryWrapper); + LambdaQueryWrapper projectCommissionLambdaQueryWrapper = new LambdaQueryWrapper<>(); + projectCommissionLambdaQueryWrapper.eq(ProjectCommission::getProjectId, id); + projectCommissionService.remove(projectCommissionLambdaQueryWrapper); + LambdaQueryWrapper subUserProjectCommissionLambdaQueryWrapper = new LambdaQueryWrapper<>(); + subUserProjectCommissionLambdaQueryWrapper.eq(SubUserProjectCommission::getProjectId, id); + subUserProjectCommissionService.remove(subUserProjectCommissionLambdaQueryWrapper); return ResultUtils.success(true); } diff --git a/src/main/java/com/greenorange/promotion/controller/projectDetail/ProjectDetailController.java b/src/main/java/com/greenorange/promotion/controller/projectDetail/ProjectDetailController.java index 4ef7535..79a11d5 100644 --- a/src/main/java/com/greenorange/promotion/controller/projectDetail/ProjectDetailController.java +++ b/src/main/java/com/greenorange/promotion/controller/projectDetail/ProjectDetailController.java @@ -180,9 +180,6 @@ public class ProjectDetailController { } subUserProjectCommissionService.updateBatchById(subUserProjectCommissionList); - - // 修改对应的项目明细抽佣记录 - return ResultUtils.success(true); }