From 02bc3bfe47e3d5311a0bb041c94e70a34b1ca73c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 09 四月 2024 09:03:01 +0800
Subject: [PATCH] git ch

---
 server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
index 2cde2ac..36414c2 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/TaxesServiceImpl.java
@@ -189,6 +189,20 @@
         update.setImgurl(taxes.getImgurl());
         taxesMapper.updateById(update);
 
+        //鏌ヨ寮�绁ㄦ槑缁嗚褰�
+        List<TaxDetial> taxDetialList = taxDetialMapper.selectList(new QueryWrapper<TaxDetial>().lambda()
+                .eq(TaxDetial::getTaxId,taxes.getId())
+                .eq(TaxDetial::getType,Constants.TWO));
+        if(CollectionUtils.isNotEmpty(taxDetialList)){
+            for (TaxDetial taxDetial:taxDetialList) {
+                taxesMapper.update(null,new UpdateWrapper<Taxes>().lambda()
+                                .set(Taxes::getEditDate,new Date())
+                                .set(Taxes::getEditor,user.getId())
+                        .set(Taxes::getStatus,3).eq(Taxes::getId,taxDetial.getDelTaxId()));
+            }
+        }
+
+
         //瀛樺偍寰呭姙淇℃伅
         Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.TAXES;
         //鍒犻櫎鍏朵粬寰呭姙
@@ -235,7 +249,9 @@
         MPJLambdaWrapper<Taxes> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(Taxes.class);
         queryWrapper.selectAs(Solutions::getName,Taxes::getSolutionName);
+        queryWrapper.selectAs(SystemUser::getRealname,Taxes::getCancelUserName);
         queryWrapper.leftJoin(Solutions.class,Solutions::getId,Taxes::getSolutionId);
+        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Taxes::getCancelUserId);
         Taxes model =taxesJoinMapper.selectById(id);
         if(model==null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
             throw  new BusinessException(ResponseStatus.DATA_EMPTY);
@@ -648,7 +664,7 @@
             taxDetial.setTaxId(taxes.getId());
             taxDetial.setTotalFee(taxesInvoicingVO.getAmount());
             taxDetial.setFee(taxesInvoicingVO.getAmount());
-            taxDetial.setInsuranceApplyId(taxes.getApplyId());
+            taxDetial.setInsuranceApplyId(taxes.getInsuranceApplyId());
             if(taxesInvoicingVO.getType().equals(Constants.ZERO)){
                 taxDetial.setType(taxesInvoicingVO.getType());
             }else if(taxesInvoicingVO.getType().equals(Constants.ONE)){
@@ -675,6 +691,7 @@
                 taxDetial.setTotalFee(chTaxes.getPrice());
                 taxDetial.setFee(chTaxes.getPrice());
                 taxDetial.setDelTaxId(chTaxes.getId());
+                taxDetial.setInsuranceApplyId(taxes.getInsuranceApplyId());
                 taxDetial.setType(Constants.TWO);
                 taxDetailList.add(taxDetial);
             }

--
Gitblit v1.9.3