From 9046d337cb710d64d9c6706cbedd5830c01fa2c7 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Mar 2024 14:39:39 +0800
Subject: [PATCH 1/2] =?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

---
 .../api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java   | 2 ++
 .../fin/biz/fincompanyinvoicing/FinCompanyInvoicingService.java | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
index e8d537266b..87481002b4 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincompanyinvoicing/FinCompanyInvoicingDetailsVo.java
@@ -54,6 +54,8 @@ public class FinCompanyInvoicingDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("1个人 2企业")
+    private String customTypeKey;
 	@ApiModelProperty("银行账号")
     private String bankAccount; // 银行账号
 	@ApiModelProperty("开户行")
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 1aef4d31f2..14bbaa3494 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
@@ -510,6 +510,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         ResultBean rb = ResultBean.fireFail();
         FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = fetchDetailsVoBySid(sid);
         if (finCompanyInvoicingDetailsVo != null && StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getSid())) {
+            finCompanyInvoicingDetailsVo.setCustomTypeKey("2");
             return rb.success().setData(finCompanyInvoicingDetailsVo);
         }
         CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(sid).getData();
@@ -523,6 +524,7 @@ public class FinCompanyInvoicingService extends MybatisBaseService<FinCompanyInv
         finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
         finCompanyInvoicingDetailsVo.setCreateBySid(crmCustomerTempVo.getCreateBySid());
         finCompanyInvoicingDetailsVo.setStaffSid(crmCustomerTempVo.getStaffSid());
+        finCompanyInvoicingDetailsVo.setCustomTypeKey("1");
         return rb.success().setData(finCompanyInvoicingDetailsVo);
     }
 

From c4f68bf83a23c3518e0b713f65372f83278104a2 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Mar 2024 16:44:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=BC=80=E7=A5=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusBillApplicationService.java            | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
index 14f4d44ee6..ecf5bbb4cd 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java
@@ -362,6 +362,31 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             }
             vo.setFinBillTrailers(busBillTrailerVos);
             vo.setFinBillVehicles(busBillVehicleVos);
+            //生成的合同下载地址
+
+            int contractBtns = 0;
+            //根据合同号查询销售订单数据
+            BusSalesOrder busSalesOrder = baseMapper.selectByContract(busDeliveredApply.getContractNo());
+            SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+            BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+            BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+            if ("1".equals(busSalesOrder.getPayTypeKey())) {//全款
+                contractBtns = 1;
+            }else{
+                if(StringUtils.isNotBlank(loanSolutions.getTypeKey())){
+                    contractBtns = 2;
+                }
+            }
+            vo.setContractBtns(contractBtns);
+            //销售订单开票sid
+            if(StringUtils.isNotBlank(busSalesOrder.getAffiliatedCompanySid())){
+                vo.setOrderInvoiceSid(busSalesOrder.getAffiliatedCompanySid());
+            }
+            if(busSalesOrderPrice != null){
+                if(busSalesOrderPrice.getSingleFinalPrice() != null){
+                    vo.setOrderInvoicePrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                }
+            }
             return vo;
         }
         String sid = busBillApplicationVo.getSid();