修改返回SAP报文

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()));
                         //如果设置的自动认证走申请认证逻辑