From 38d1fdcdd4058e39e1dc6d716381a6f51450c2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 3 Jan 2024 09:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9ESAP?=
 =?UTF-8?q?=E6=8A=A5=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/erp/service/impl/InvoiceAuthServiceImpl.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
index 90e76522..96bc7f4d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java
@@ -355,7 +355,8 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 log.info("非全电但是号码");
             }
             log.info("发票号码{}", fphm);
-            String uuid = zdata1.getZFPDM() + fphm;
+            String uuid = StringUtils.isNotBlank(zdata1.getZFPDM())?zdata1.getZFPDM():"" + fphm;
+            log.info("uuid===>{}", uuid);
             zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
             TdxRecordInvoice recordInvoiceByUuid = tDxrecordInvoiceDao.getRecordInvoiceByUuid(uuid);
             //查询票池
@@ -381,12 +382,13 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
             boolean flag = false;
             log.info("zdata1.getZFPHM():{}", zdata1.getZFPHM());
             String fphm = zdata1.getZFPHM();
-            if (org.apache.commons.lang3.StringUtils.isNotBlank(fphm) && fphm.length() > 8 && !("26".equals(zdata1.getZFPLX()) || "27".equals(zdata1.getZFPLX()))) {
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(fphm) && fphm.length() > 8 && !("31".equals(zdata1.getZFPLX()) || "32".equals(zdata1.getZFPLX()))) {
                 fphm = fphm.replace(zdata1.getZFPDM(), "");
                 log.info("非全电但是号码");
             }
             log.info("发票号码{}", fphm);
-            String uuid = zdata1.getZFPDM() + fphm;
+            String uuid = StringUtils.isNotBlank(zdata1.getZFPDM())?zdata1.getZFPDM():""  + fphm;
+            log.info("uuid===>{}", uuid);
             //销项标识
             String xxbs = zdata1.getXXBS();
             if (fplxList.contains(zdata1.getZFPLX()) && !"X".equalsIgnoreCase(xxbs)) {
@@ -409,6 +411,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                     updateWrapper.set("bzr", zdata1.getZJBRT());
                     int update = tDxrecordInvoiceDao.update(null, updateWrapper);
                     if (update > 0) {
+                        log.info("更新成功");
                         SysDeptEntity org = sysDeptDao.getOrg(recordInvoiceByUuid.getGfTaxNo());
                         zdata1.setZFPLX(convertFpzldm(zdata1.getZFPLX()));
                         //如果设置的自动认证走申请认证逻辑