From 5892aa589460916d73a589364f0faf8304ad8c77 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Mon, 11 Mar 2024 17:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinBillApplicationService.java            | 96 +++++++++++++++++++
 .../FinCompanyInvoicingMapper.java            |  3 +
 .../FinCompanyInvoicingService.java           |  6 ++
 3 files changed, 105 insertions(+)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
index 04e2bd9f68..12e051238d 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
@@ -63,6 +63,8 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderContractNoDto
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
@@ -227,6 +229,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     @Autowired
     private LoanNoGuaranteeCreditReviewFeign loanNoGuaranteeCreditReviewFeign;
     @Autowired
+    private BusSalesOrderBorrowerFeign busSalesOrderBorrowerFeign;
+    @Autowired
     private FlowFeign flowFeign;
     @Autowired
     private BaseVehicleStateFeign baseVehicleStateFeign;
@@ -466,21 +470,67 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (StringUtils.isBlank(solutionsDetailsVo.getTypeKey())){//担保
                     String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(record.getBusSalesOrderSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
                     LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
+                    BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerSid()).getData();
+                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                     record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     record.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
                         record.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
+                        record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
+                        record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByTaxpayerNo(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()).getData();
                         record.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+                        record.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
+                        String openTickRemarks = "";
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getAddress())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getAddress() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getPhone())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getPhone() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankName())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankName() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankAccount() + "；";
+                        }
+                        record.setInvoiceInfo(openTickRemarks);
                     }
                 }else if ("01".equals(solutionsDetailsVo.getTypeKey())){//非担保
                     LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                     record.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     record.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
                         record.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
+                        record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()).getData();
                         record.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                        record.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
+                        String openTickRemarks = "";
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getAddress())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getAddress() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getPhone())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getPhone() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankName())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankName() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankAccount() + "；";
+                        }
+                        record.setInvoiceInfo(openTickRemarks);
                     }
                 }
             }
@@ -5246,21 +5296,67 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 if (StringUtils.isBlank(solutionsDetailsVo.getTypeKey())){//担保
                     String jfkcSid = loanHomevisitInvestigateFeign.selSaleOrderSidAndBorrSid(busSalesOrder.getSid(), busSalesOrderVehicle.getBorrowerSid()).getData();
                     LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerFeign.selectByMainSid(jfkcSid).getData();
+                    BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                     vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
                         vinListVos1.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getBorrowerName());
+                        vinListVos1.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
+                        vinListVos1.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByTaxpayerNo(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum()).getData();
                         vinListVos1.setInvoiceName(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+                        vinListVos1.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
+                        String openTickRemarks = "";
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getAddress())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getAddress() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getPhone())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getPhone() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankName())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankName() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankAccount() + "；";
+                        }
+                        vinListVos1.setInvoiceInfo(openTickRemarks);
                     }
                 }else if ("01".equals(solutionsDetailsVo.getTypeKey())){//非担保
                     LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                    CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
                     vinListVos1.setInvoiceTypeKey(busSalesOrder.getBillingTypeKey());
                     vinListVos1.setInvoiceType(busSalesOrder.getBillingType());
                     if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
                         vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getBorrowerName());
+                        vinListVos1.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
+                        vinListVos1.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
                     }else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())){
+                        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingByName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany()).getData();
                         vinListVos1.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                        vinListVos1.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
+                        String openTickRemarks = "";
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getTaxpayerNo() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getAddress())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getAddress() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getPhone())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getPhone() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankName())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankName() + "；";
+                        }
+                        if (com.yxt.common.base.utils.StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
+                            openTickRemarks = openTickRemarks + finCompanyInvoicingDetailsVo.getBankAccount() + "；";
+                        }
+                        vinListVos1.setInvoiceInfo(openTickRemarks);
                     }
                 }
             }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java
index b45cd7743b..c7cde1479e 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingMapper.java
@@ -87,4 +87,7 @@ public interface FinCompanyInvoicingMapper extends BaseMapper<FinCompanyInvoicin
     List<FinCompanyInvoicingDetailsVo> selectInvoingByOrgPath(String userOrgSid);
 
     FinCompanyInvoicingDetailsVo selByTaxpayerNoAndUseOrgSid(@Param("taxpayerNo") String taxpayerNo, @Param("useOrgSid") String useOrgSid);
+
+    @Select("select * from fin_company_invoicing where name = #{affiliatedCompany}")
+    FinCompanyInvoicingDetailsVo selectInvoingByName(String affiliatedCompany);
 }
\ No newline at end of file
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
index c438e567b5..1aef4d31f2 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java
@@ -569,4 +569,10 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         FinCompanyInvoicingDetailsVo vo = baseMapper.selByTaxpayerNoAndUseOrgSid(taxpayerNo,useOrgSid);
         return rb.success().setData(vo);
     }
+
+    public ResultBean<FinCompanyInvoicingDetailsVo> selectInvoingByName(String affiliatedCompany) {
+        ResultBean<FinCompanyInvoicingDetailsVo> rb = ResultBean.fireFail();
+        FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = baseMapper.selectInvoingByName(affiliatedCompany);
+        return rb.success().setData(finCompanyInvoicingDetailsVo);
+    }
 }
\ No newline at end of file