From a05b1a3fe4f7db56b8ed5b42e332b0794cb4f534 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 17 Jan 2024 17:39:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=A0=E9=99=A4=E6=A0=87=E5=8D=8F?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E6=88=96=E8=AF=81=E4=B9=A6=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=88=A0=E9=99=A4=E5=85=B3=E8=81=94=E5=85=B3?= =?UTF-8?q?=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TbCertificatePaymentController.java | 8 +++ .../ITbMemberProjectSubitemService.java | 4 +- .../TbMemberProjectSubitemServiceImpl.java | 53 +++++++++++++------ 3 files changed, 47 insertions(+), 18 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java index d21a4bde..852ae612 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbCertificatePaymentController.java @@ -16,6 +16,7 @@ import com.jero.member.service.ITbCertificatePaymentService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.member.vo.CertificatePaymentInfo; import lombok.extern.slf4j.Slf4j; import com.jero.common.system.base.controller.JeroController; @@ -41,6 +42,8 @@ import com.jero.common.aspect.annotation.AutoLog; public class TbCertificatePaymentController extends JeroController { @Autowired private ITbCertificatePaymentService tbCertificatePaymentService; + @Resource + private ITbMemberProjectSubitemService tbMemberProjectSubitemService; /** * 分页列表查询 @@ -138,8 +141,13 @@ public class TbCertificatePaymentController extends JeroController deleteByTbPaymentId(@RequestBody TbCertificatePayment tbCertificatePayment) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(TbCertificatePayment::getTbPaymentId, tbCertificatePayment.getTbPaymentId()); + TbCertificatePayment certificatePayment = tbCertificatePaymentService.getOne(wrapper); + if (certificatePayment != null){ + tbMemberProjectSubitemService.deleteProject(certificatePayment.getId()); + } tbCertificatePaymentService.remove(wrapper); return Result.OK("删除成功!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java index bb5bc3f9..53b5c400 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java @@ -47,7 +47,9 @@ public interface ITbMemberProjectSubitemService extends IService ids); - /** + void deleteProject(String id); + + /** * 通过id查询 * * @param id diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java index 3a53315e..15f22907 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java @@ -5,29 +5,30 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.jero.common.exception.JeroBootException; import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; -import com.jero.member.entity.PayMemberProjectSubitem; +import com.jero.mail.entity.PayMailBillProject; +import com.jero.mail.service.IPayMailBillProjectService; +import com.jero.mail.service.IPayMailBillService; import com.jero.member.entity.TbMemberProjectSubitem; import com.jero.member.mapper.TbMemberProjectSubitemMapper; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.pack.entity.PayPackCompanyProject; import com.jero.pack.service.IPayPackCompanyProjectService; -import com.jero.project.common.PayProjectCommon; +import com.jero.payment.entity.PayConfirmPaymentRecord; +import com.jero.payment.entity.PayPaymentRecord; +import com.jero.payment.service.IPayPaymentRecordService; +import com.jero.payment.service.impl.PayConfirmPaymentRecordService; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Arrays; -import java.util.Collections; import java.util.List; -import java.util.Objects; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; @@ -60,6 +61,15 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(PayPaymentRecord::getProjectId,id); + payPaymentRecordService.remove(wrapper1); + //删除确认收入 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayConfirmPaymentRecord::getProjectId,id); + payConfirmPaymentRecordService.remove(wrapper); + //删除开票 + LambdaQueryWrapper wrapper2 = new LambdaQueryWrapper<>(); + wrapper2.eq(PayMailBillProject::getProjectId,id); + payMailBillProjectService.remove(wrapper2); + + // 删除合同关联 + LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); + queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectId,id); + payIncomeContractAssociatedService.remove(queryPayIncomeContractAssociated); // 如果已打报，同步删除打包关联 LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); - update.eq(PayPackCompanyProject::getProjectId,tbMemberProjectSubitem.getId()); + update.eq(PayPackCompanyProject::getProjectId,id); payPackCompanyProjectService.remove(update); }