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

dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java

@@ -225,9 +225,9 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
 //                    String dkzt= dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,pageList.get(i).getInAccountStatus());
 //                    pageList.get(i).setInAccountStatus(dkzt);
 //                    vo.setInAccountStatus(dkzt);
-                    vo.setSelect(true);
-                    if (!"1".equals(pageList.get(i).getAuthStatus())) {
-                        vo.setSelect(false);
+                    vo.setSelect(false);
+                    if ("1".equals(pageList.get(i).getAuthStatus())) {
+                        vo.setSelect(true);
                     }
 
                     log.info("手工勾选查询返回对象VO {}",vo);

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();