From 672d71bc4d91d236a190f92e900748dbe82a6c8a Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Sun, 4 Jun 2023 11:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=9E=E5=90=8D=E5=AE=A2?=
 =?UTF-8?q?=E7=A5=A8=E6=9C=AA=E8=BF=9B=E8=A1=8C=E4=BB=B7=E7=A8=8E=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dxhy/erp/service/SNPushCheckRecordService.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
index 533c934e..6b0cd5df 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@@ -623,14 +623,19 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice);
             log.info("进行价税分离的发票信息为:{}", invoiceInfo);
             ServiceResult<InvoiceInfo> invoiceResult = new ServiceResult<>();
+
+            boolean flag = false;
             //0523晚成伟提出新需求，客运汽车票必须实名才可以进行价税分离
             if (SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)) {
                 if (StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())) {
                     log.info("非实名的实名客票 不需要做价税分离");
+                    flag = true;
+                    invoiceResult.setMsg("ok");
+                    invoiceResult.setResult(true);
                 }
-                invoiceResult.setMsg("ok");
-                invoiceResult.setResult(true);
-            } else {
+            }
+
+            if(!flag) {
                 invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
                 InvoiceInfo data = invoiceResult.getData();
                 if (data != null) {
@@ -645,6 +650,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 }
             }
 
+
             if (!"ok".equals(invoiceResult.getMsg()) && !"0000".equals(invoiceResult.getMsg())) {
                 log.info("价税分离失败:{}", invoiceResult.getMsg());
                 return invoiceResult.getMsg();