Merge remote-tracking branch 'origin/master'

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

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("开户行")

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