Merge branches 'release' and 'test' of http://192.168.12.182/invoice/pt into test

Conflicts: dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
2 years ago · 8aa8a93e78
parent 1bd03dd958 0fa1a808ad
commit 8aa8a93e78
1 changed files with 4 additions and 2 deletions
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
@ -616,9 +616,11 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
            //0523晚成伟提出新需求，客运汽车票必须实名才可以进行价税分离
            if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
                if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
-                    log.info("客运汽车票没有实名信息,不需要做价税分离");
+                    log.info("非实名的实名客票 不需要做价税分离");
                }
-            }else{
+                invoiceResult.setMsg("ok");
+                invoiceResult.setResult(true);
+            }else {
                invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
                InvoiceInfo data = invoiceResult.getData();
                if (data != null) {