From 2af1b1714ca2af7d92f20bff773b5a4a12d4da30 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 9 Oct 2023 11:01:32 +0800
Subject: [PATCH] =?UTF-8?q?fix=2074292=EF=BC=8C=E5=88=A4=E6=96=AD=E4=B8=8D?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8F=91=E7=A5=A8=E6=97=B6=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE=E4=B8=BAnull=20add=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayMeetingSituationController.java         | 18 ++++++++++++++++++
 .../impl/PayMeetingSituationServiceImpl.java   | 13 +++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
index 0b745288..0ae0d5b9 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/PayMeetingSituationController.java
@@ -8,6 +8,8 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.jero.aspect.annotation.CompanyNameTranslate;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.DictPoint;
@@ -45,6 +47,7 @@ import io.swagger.annotations.ApiOperation;
 import com.jero.common.aspect.annotation.AutoLog;
 
 import static org.jeecg.modules.jmreport.desreport.b.b.i;
+import static org.jeecg.modules.jmreport.desreport.b.b.m;
 
 
 /**
@@ -434,4 +437,19 @@ public class PayMeetingSituationController extends JeroController<PayMeetingSitu
         payMeetingSituationService.guestsDeleteFile(guestsUploadFileVO);
         return Result.OK("删除文件成功!");
     }
+
+    @GetMapping(value = "/fix")
+    public Result<?> fix(@RequestParam(name = "meetingId") String meetingId) {
+        LambdaQueryWrapper<PayMeetingSituation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(PayMeetingSituation::getMeetingId,meetingId);
+        wrapper.isNotNull(PayMeetingSituation::getCompanyPhone);
+        List<PayMeetingSituation> list = payMeetingSituationService.list(wrapper);
+        for (PayMeetingSituation payMeetingSituation : list) {
+            LambdaUpdateWrapper<PayMeetingSituation> update = new LambdaUpdateWrapper<>();
+            update.eq(PayMeetingSituation::getId,payMeetingSituation.getId());
+            update.set(PayMeetingSituation::getCompanyPhone,PasswordUtil.decrypt(payMeetingSituation.getCompanyPhone()));
+            payMeetingSituationService.update(update);
+        }
+        return Result.OK();
+    }
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index 3f8f4871..031214b2 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -1195,6 +1195,19 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
 
                 BeanUtils.copyProperties(updateInvoicePram, payMeetingSituation1);
             }
+            //不需要发票时清空开票信息
+            if (ProjectCommon.NEED_INVOICE0.equals(needInvoice)) {
+                LambdaUpdateWrapper<PayMeetingSituation> update = new LambdaUpdateWrapper<>();
+                update.eq(PayMeetingSituation::getId,payMeetingSituation.getId());
+                update.set(PayMeetingSituation::getDutyCode,null);
+                update.set(PayMeetingSituation::getCompanyAddress,null);
+                update.set(PayMeetingSituation::getCompanyPhone,null);
+                update.set(PayMeetingSituation::getOpeningBank,null);
+                update.set(PayMeetingSituation::getBankAccount,null);
+                update.set(PayMeetingSituation::getLinkBankNumber,null);
+                update.set(PayMeetingSituation::getInvoiceProject,null);
+                this.update(update);
+            }
             String paymentRecord = payMeetingSituation.getPaymentRecord();
             String orderCode = payMeetingSituation.getOrderCode();
             //优先判断合同 判断是否为合同添加的参会人