Merge remote-tracking branch 'origin/master'

2 years ago · 65dbf369ea
10 changed files with 200 additions and 133 deletions
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java
@ -10,7 +10,7 @@ import lombok.Data;
 */
@Data
 public class FinSelectVo {
-
+    private String receivablesSid;
    @ApiModelProperty("款项名称")
    private String receivablesName;

@ -23,4 +23,14 @@ public class FinSelectVo {
    private String notSubscriptionMoney;

    private String remarks;
+    @ApiModelProperty("付款时间")
+    private String subscriptionDate;
+    @ApiModelProperty("收款开户行")
+    private String collectionBank;
+    @ApiModelProperty("收款账户")
+    private String receivingName;
+    @ApiModelProperty("付款人")
+    private String payerName;
+    @ApiModelProperty("付款时间")
+    private String collectionDate;
 }
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@ -82,9 +82,14 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDetailsVo;
+import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
+import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
@ -204,6 +209,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
    private LoanSolutionsFeign loanSolutionsFeign;
    @Autowired
    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
+    @Autowired
+    private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign;
+    @Autowired
+    private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+

    /**
     * 构造出库申请的查询条件
@ -2265,7 +2275,37 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
        if (receiveInvoiceVoResultBean.getData() != null) {
            List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList();
            List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList());
-            deliveredFinVo.setFinSelectVoList(voList);
+            voList.removeAll(Collections.singleton(null));
+            List<FinSelectVo> finSelectVos = new ArrayList<>();
+            if (!voList.isEmpty()) {
+                for (FinSelectVo finSelectVo : voList) {
+                    String receivablesSid = finSelectVo.getReceivablesSid();
+                    FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(receivablesSid).getData();
+                    if (data != null) {
+                        String collSid = data.getCollSid();
+                        if (StringUtils.isNotBlank(data.getSubscriptionDate())) {
+                            finSelectVo.setSubscriptionDate(data.getSubscriptionDate());
+                        }
+                        FinCollectionConfirmationDetailsVo confirmationDetailsVo = finCollectionConfirmationFeign.fetchBySid(collSid).getData();
+                        if (null != confirmationDetailsVo) {
+                            if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionBank())) {
+                                finSelectVo.setCollectionBank(confirmationDetailsVo.getCollectionBank());
+                            }
+                            if (StringUtils.isNotBlank(confirmationDetailsVo.getReceivingName())) {
+                                finSelectVo.setReceivingName(confirmationDetailsVo.getReceivingName());
+                            }
+                            if (StringUtils.isNotBlank(confirmationDetailsVo.getPayerName())) {
+                                finSelectVo.setPayerName(confirmationDetailsVo.getPayerName());
+                            }
+                            if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionDate())) {
+                                finSelectVo.setCollectionDate(confirmationDetailsVo.getCollectionDate());
+                            }
+                        }
+                    }
+                    finSelectVos.add(finSelectVo);
+                }
+            }
+            deliveredFinVo.setFinSelectVoList(finSelectVos);
            InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
            if (invoiceVo != null) {
                VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveInvoiceVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveInvoiceVo.java
@ -14,6 +14,8 @@ import java.util.List;
@Data
 public class ReceiveInvoiceVo {

+
+
    private List<ReceiveSeleteVo> receiveSeleteVoList = new ArrayList<>();

    private InvoiceVo invoiceVo;
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/ReceiveSeleteVo.java
@ -3,6 +3,8 @@ package com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+import java.util.Date;
+
 /**
 * @Author dimengzhe
 * @Date 2023/4/19 14:18
@ -11,6 +13,7 @@ import lombok.Data;
@Data
 public class ReceiveSeleteVo {

+    private String receivablesSid;
    @ApiModelProperty("款项名称")
    private String receivablesName;

@ -23,4 +26,15 @@ public class ReceiveSeleteVo {
    private String notSubscriptionMoney;
    @ApiModelProperty("备注")
    private String remarks;
+
+    @ApiModelProperty("付款时间")
+    private String subscriptionDate;
+    @ApiModelProperty("收款开户行")
+    private String collectionBank;
+    @ApiModelProperty("收款账户")
+    private String receivingName;
+    @ApiModelProperty("付款人")
+    private String payerName;
+    @ApiModelProperty("付款时间")
+    private String collectionDate;
 }
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
@ -161,6 +161,7 @@
    <select id="receivedSelect" resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo">
        SELECT furd.receivablesName,
               furd.reveivableMoney,
+               furd.sid                  as receivablesSid,
               (
                   SELECT sum(subscriptionMoney)
                   FROM fin_selected_receivables_detailed
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@ -51,7 +51,7 @@ public enum ProcDefEnum {
    BUSSALESORDERRETURNVEHAPPLY("销售订单退车申请", "process_tzjjs03y:1:1012504"),
    BASETRAILEROUTAPPLY("挂车出库申请", "process_tkw6vhfw:1:1705004"),
    FINFUNDSAPPLY("款项结转申请", "process_ypafrrvg:1:2257504"),
-    BUSHANDOVER("交车确认", "process_e8feloik:5:1747508"),
+    BUSHANDOVER("交车确认", "process_e8feloik:6:2675004"),
    LOANFINPOLICYRECORDAPPLY("金融产品政策备案", "process_u45lo7qc:1:2272516"),
    LOANOTHERPOLICYRECORDAPPLY("其它融产品备案", "process_7pptyzfc:1:2272524"),
    DEALERFILINGAPPLY("经销商备案", "process_jdu35cog:3:2577504"),
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单1.docx
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单1.docx
@ -0,0 +1,22 @@
+                          金融方案预估报价单
+
+                                                                      车型：
+${model!}
+                                                                融资项目：
+${templateName!}
+                                                                      总期数
+${period!}
+                                                          前${times!}期月还
+${previousRepay!}
+                                                             剩余期数月还
+${monthlyRepay!}
+                                                          预计首期还款日
+${returnTime!}
+                                                    名义（留购）价款：
+${nominalPrice!}
+                       注：结清时需交纳此费用
+                                       
+                                       
+                                     客户签章：
+                                       
+                                                    年      月      日      
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单2.docx
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单2.docx
@ -0,0 +1,23 @@
+                          金融方案预估报价单
+
+                                                                      车型：
+${model!}
+                                                                融资项目：
+${templateName!}
+                                                             预估应收合计
+${amountTotal!}
+                                                                      总期数
+${period!}
+                                                          前${times!}期月还
+${previousRepay!}
+                                                             剩余期数月还
+${monthlyRepay!}
+                                                    名义（留购）价款：
+${nominalPrice!}
+                                                          预计首期还款日
+${returnTime!}
+                                       
+                                       
+                                     客户签章：
+                                       
+                                                    年      月      日      
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单3.docx
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单3.docx
@ -0,0 +1,29 @@
+                          金融方案预估报价单
+
+                                                                      车型：
+${model!}
+                                                                融资项目：
+${templateName!}
+                                                             预估应收合计
+${amountTotal!}
+                                                                贷款保证金
+￥${bondAmounts!}
+                                                                落户保证金
+￥${depositSettle!}
+                                                                保险保证金
+￥${depositPremium!}
+                                                                      总期数
+${period!}
+                                                          前${times!}期月还
+${previousRepay!}
+                                                             剩余期数月还
+${monthlyRepay!}
+                                                    名义（留购）价款：
+￥${nominalPrice!}
+                                                          预计首期还款日
+${returnTime!}
+                                       
+                                       
+                                     客户签章：
+                                       
+                                                    年      月      日      
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单4.docx
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/resources/template_word/金融方案预估报价单4.docx
@ -0,0 +1,42 @@
+                          金融方案预估报价单
+
+                                                                      车型：
+${model!}
+                                                                融资项目：
+${templateName!}
+                                                          预估应收合计：
+${amountTotal!}
+                                                                融资首付：
+￥${downPayAmounts!}
+                                                             贷款保证金：
+￥${bondAmounts!}
+                                                                   服务费：
+￥${serviceAmount!}
+                                                       代收首年保险费：
+￥${proxyPremium!}
+                                                             落户保证金：
+￥${depositSettle!}
+                                                                   补车价：
+￥${vehOtherPrice!}
+                                                             代收购置税：
+￥${proxyPurchasetax!}
+                                                             保险保证金：
+￥${depositPremium!}
+                                                                其他费用：
+￥${otherAmount!}
+                                                             代收意外险：
+${proxyAccidentPremium!}
+                                                                   总期数：
+${period!}
+                                                       前${times!}期月还：
+${previousRepay!}
+                                                          剩余期数月还：
+${monthlyRepay!}
+                                                    名义（留购）价款：
+￥${nominalPrice!}
+                                                       预计首期还款日：
+${returnTime!}
+
+                                     客户签章：
+                                       
+                                                    年      月      日