From 18c6b11297c41889de2c22f7c0116f55632f910e Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Fri, 26 May 2023 11:20:25 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=AE=A2=E8=BF=90=E6=B1=BD=E8=BD=A6?=
 =?UTF-8?q?=E7=A5=A8=E5=8F=AA=E6=9C=89=E4=B9=98=E8=BD=A6=E4=BA=BA=E5=92=8C?=
 =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E9=83=BD=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=89=8D=E5=81=9A=E4=BB=B7=E7=A8=8E?=
 =?UTF-8?q?=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/service/impl/SysUserServiceImpl.java  |  2 +
 .../erp/service/SNPushCheckRecordService.java | 42 +++++++------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
index 881c9306..87bc2a29 100644
--- a/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
+++ b/dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java
@@ -454,6 +454,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
     }
 
     private void toDeptOrgCode(User user, List<TaxOrgCode> orgCodeList, List<SysDeptEntity> queryDept) {
+        log.info("查询到的企业列表为:{}",queryDept);
         String qsStatus = "0";
         String productType = "0";
         if (queryDept.size() > 0) {
@@ -469,6 +470,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             orgCodeList.addAll(oldTaxOrgCode);
             qsStatus = queryDept.get(0).getQsStatus();
             productType = queryDept.get(0).getProductType();
+            log.info("orgCodeList:{}",orgCodeList);
             user.setOrgCodes(orgCodeList);
             user.setQsStatus(qsStatus);
             user.setProductType(productType);
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 c3e92e1c..eb50f764 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
@@ -612,24 +612,24 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
 
             InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice);
             log.info("进行价税分离的发票信息为:{}", invoiceInfo);
-
+            ServiceResult<InvoiceInfo> invoiceResult = new ServiceResult<>();
             //0523晚成伟提出新需求，客运汽车票必须实名才可以进行价税分离
-//            if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
-//                if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
-//                    return result;
-//                }
-//            }
-
-            ServiceResult<InvoiceInfo> invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
-            InvoiceInfo data = invoiceResult.getData();
-            if (data != null) {
-                invoice.setIsDeductible(data.getIsDeductible());
-                invoice.setTaxRate(data.getTaxRate());
-                if (data.getInvoiceAmount() != null) {
-                    invoice.setTotalAmount(data.getInvoiceAmount().toString());
+            if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
+                if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
+                    log.info("客运汽车票没有实名信息,不需要做价税分离");
                 }
-                if (data.getTaxAmount() != null) {
-                    invoice.setTotalTax(data.getTaxAmount().toString());
+            }else{
+                invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
+                InvoiceInfo data = invoiceResult.getData();
+                if (data != null) {
+                    invoice.setIsDeductible(data.getIsDeductible());
+                    invoice.setTaxRate(data.getTaxRate());
+                    if (data.getInvoiceAmount() != null) {
+                        invoice.setTotalAmount(data.getInvoiceAmount().toString());
+                    }
+                    if (data.getTaxAmount() != null) {
+                        invoice.setTotalTax(data.getTaxAmount().toString());
+                    }
                 }
             }
 
@@ -637,16 +637,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 log.info("价税分离失败:{}", invoiceResult.getMsg());
                 return invoiceResult.getMsg();
             }
-//            DynamicContextHolder.push(DbConstant.BASICS_READ);
-//
-//            SysDeptEntity orgByCompCode = sysDeptDao.getOrgByCompCode(compCode);
-//            log.info("查询的组织信息为:{}",JSONObject.toJSONString(orgByCompCode));
-//            if(orgByCompCode != null) {
-//                reimburse.setGfTaxNo(orgByCompCode.getTaxno());
-//                reimburse.setGfName(orgByCompCode.getTaxname());
-//                reimburse.setGfAddressAndPhone(orgByCompCode.getAddress() + orgByCompCode.getPhone());
-//                reimburse.setGfBankAndNo(orgByCompCode.getBank() + orgByCompCode.getAccount());
-//            }
 
             reimburse = convertToReimburse(invoice, reimburse, fplxdm, company);