Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -147,7 +147,6 @@
         bmb.paymentAccessNoValue
         FROM base_manufacturer_bank bmb
         WHERE bmb.sid = #{sid}
-        AND bmb.isDelete = 0
     </select>
 
     <select id="selectBankAccount" resultType="java.lang.String">

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -146,4 +147,8 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     LoanFinOtherPolicy selectByOtherSid(String otherPolicySid);
 
     BusSalesOrderVehicle selectByVinSid(String busVinSid);
+
+    BusSalesOrder selectByOrderSid(String salesOrderSid);
+
+    LoanFinBank selectFinBnk(String contractNo);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -281,4 +281,17 @@
     <select id="selectByVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select * from anrui_buscenter.bus_sales_order_vehicle where sid = #{busVinSid}
     </select>
+
+    <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from anrui_buscenter.bus_sales_order where sid = #{salesOrderSid}
+    </select>
+
+    <select id="selectFinBnk" resultType="com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank">
+        select lb.* from anrui_buscenter.bus_sales_order bo
+        left join anrui_riskcenter.loan_solutions ls on ls.salesOrderSid = bo.sid
+        left join anrui_riskcenter.loan_fin_policy lp on lp.sid = ls.policySid
+        left join anrui_riskcenter.loan_fin_bank lb on lb.sid = lp.bankSid
+        where bo.contractNo = #{contractNo}
+
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -88,6 +88,8 @@ import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.arreceivable.ARReceivable;
 import com.yxt.anrui.fin.api.kingdee.arreceivebill.ARReceivebill;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
+import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
+import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
 import com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService;
 import com.yxt.anrui.fin.biz.finbilltrailer.FinBillTrailerService;
 import com.yxt.anrui.fin.biz.finbillvehicle.FinBillVehicleService;
@@ -99,6 +101,7 @@ import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService;
 import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.anrui.fin.biz.kingdee.arreceivebill.ArReceivebillService;
 import com.yxt.anrui.fin.biz.kingdee.bdcustomer.BdCustomerService;
+import com.yxt.anrui.fin.biz.kingdee.capitalcreditresult.OtherReceivableBillCreditResultService;
 import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@@ -110,6 +113,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffFeign;
 import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffsDto;
 import com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetailssDto;
+import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBank;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.LoanFinOtherPolicy;
 import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
@@ -192,6 +196,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
     private BaseVehicleStateFeign baseVehicleStateFeign;
     @Autowired
     private LoanDiffFeign loanDiffFeign;
+    @Autowired
+    private OtherReceivableBillCreditResultService creditResultService;
 
     private QueryWrapper<FinCollectionConfirmation> createQueryWrapper(FinCollectionConfirmationQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1746,8 +1752,31 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 if(finSelectedReceivablesDetailed.getSubscriptionMoney().compareTo(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney())) != 0){
                     //有差额
                     if(isTue){//不一致
-
-
+                        //根据busVinSid查询融资放款的是否已认完款，若已认完，则推送，若未认完则不推送
+                        List<FinSelectedReceivablesDetailedVo> voList = finSelectedReceivablesDetailedService.selectListByVin2(finUncollectedReceivablesDetailed.getContractNo(), finUncollectedReceivablesDetailed.getBusVinSid(), 3);
+                        BigDecimal bigDecimalVinAll = voList.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        List<FinUncollectedReceivablesDetailed> unList = finUncollectedReceivablesDetailedService.selectListByBusVinSid2(finUncollectedReceivablesDetailed.getBusVinSid());
+                        BigDecimal unDecimalVinAll = unList.stream().map(FinUncollectedReceivablesDetailed::getReveivableMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+                        if(bigDecimalVinAll.compareTo(unDecimalVinAll) == 0){//认完
+                            if(bigAdd.compareTo(decimalAll) != 0){//不相等，推送放款差额确认待办
+                                LoanDiffDetailssDto loanDiffDetailssDto = new LoanDiffDetailssDto();
+                                loanDiffDetailssDto.setBankSid(loanFinPolicy.getBankSid());
+                                loanDiffDetailssDto.setBankName(loanFinPolicy.getBankShortName());
+                                loanDiffDetailssDto.setBorrowName(busSalesOrderVehicle.getBorrowName());
+                                loanDiffDetailssDto.setBorrowSid(busSalesOrderVehicle.getBorrowerSid());
+                                loanDiffDetailssDto.setMakeLoan(new BigDecimal(finUncollectedReceivablesDetailed.getReveivableMoney()));
+                                loanDiffDetailssDto.setRealityLoan(finSelectedReceivablesDetailed.getSubscriptionMoney());
+                                loanDiffDetailssDto.setDiffLoan(decimalAll);
+                                loanDiffDetailssDto.setMakeDiscount(loanSolutions.getFactoryDiscount());
+                                loanDiffDetailssDto.setMakeLoanMargin(loanSolutions.getBondAmount());
+                                loanDiffDetailssDto.setMakeOtherDiscount(loanSolutionsOtherpolicy.getOtherDiscount());
+                                loanDiffDetailssDto.setReceivedPremium(loanSolutionsDetail.getProxyAccidentPremium());
+                                loanDiffDetailssDto.setVinNo(busSalesOrderVehicle.getLinkNo());
+                                loanDiffDetailssDto.setVinSid(busSalesOrderVehicle.getLinkSid());
+                                loanDiffDetailssDto.setBusVinSid(busSalesOrderVehicle.getSid());
+                                loanDiffDetailssDtos.add(loanDiffDetailssDto);
+                            }
+                        }
                     }else{
                         if(bigAdd.compareTo(decimalAll) != 0){//不相等，推送放款差额确认待办
                             LoanDiffDetailssDto loanDiffDetailssDto = new LoanDiffDetailssDto();
@@ -1766,6 +1795,75 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             loanDiffDetailssDto.setVinSid(busSalesOrderVehicle.getLinkSid());
                             loanDiffDetailssDto.setBusVinSid(busSalesOrderVehicle.getSid());
                             loanDiffDetailssDtos.add(loanDiffDetailssDto);
+                        }else{
+                            CapitalCreditResult creditResult = new CapitalCreditResult();
+                            //推送其他应收单
+                            BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
+                            String customerNumber = "";
+                            //判断财务系统是否有客户
+                            Boolean aBoolean = bdCustomerService.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                            String linkNo = "";
+                            if (!aBoolean) {
+                                BdCustomer bdCustomer = new BdCustomer();
+                                bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                                bdCustomer.setFShortName(busSalesOrder.getContractNo());
+                                BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(busSalesOrder.getPurchaseSystemSid()).getData();
+                                bdCustomer.setTOrgIds(data.getOrgCode());
+                                if (com.yxt.common.base.utils.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                                    String vinNo = busSalesOrderVehicle.getLinkNo();
+                                    if (vinNo.length() > 8) {
+                                        linkNo = vinNo.substring(vinNo.length() - 8);
+                                    } else {
+                                        linkNo = busSalesOrderVehicle.getLinkNo();
+                                    }
+                                    bdCustomer.setFName(busSalesOrderVehicle.getBorrowName() + linkNo);
+                                } else {
+                                    bdCustomer.setFName(busSalesOrderVehicle.getBorrowName() + busSalesOrderVehicle.getTemporaryNo());
+                                }
+                                ResultBean<String> resultBean = bdCustomerService.draftBdCustomer(bdCustomer);
+                                if (resultBean.getSuccess()) {
+                                    customerNumber = bdCustomer.getFNumber();
+                                }
+                            } else {
+                                customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                            }
+                            creditResult.setCommUnit(customerNumber);
+                            SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(busSalesOrder.getUseOrgSid()).getData();
+                            creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                            creditResult.setBussDate(DateUtil.formatDate(new Date()));
+                            List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
+                            SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
+                            if (loanSolutions.getBondAmount() != null) {//贷款保证金
+                                CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                                creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                                creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getBondAmount().toString());
+                                creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                                collectionDetailDtoListOne.add(creditResultDetailDto);
+                            }
+                            if (loanSolutions.getFactoryDiscount() != null) {//主产品厂家贴息
+                                CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                                creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                                creditResultDetailDto.setExTaxMoney("-" + loanSolutions.getFactoryDiscount().toString());
+                                creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                collectionDetailDtoListOne.add(creditResultDetailDto);
+                            }
+                            if (loanSolutionsOtherpolicy.getOtherDiscount() != null) {//实扣其他融厂家贴息
+                                CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                                creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                                creditResultDetailDto.setExTaxMoney("-" + loanSolutionsOtherpolicy.getOtherDiscount().toString());
+                                creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                                collectionDetailDtoListOne.add(creditResultDetailDto);
+                            }
+                            if (loanSolutionsDetail.getProxyAccidentPremium() != null) {//已收意外险
+                                CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                                creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                                creditResultDetailDto.setExTaxMoney("-" + loanSolutionsDetail.getProxyAccidentPremium().toString());
+                                creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                                collectionDetailDtoListOne.add(creditResultDetailDto);
+                            }
+                            creditResult.setResultDetails(collectionDetailDtoListOne);
+                            creditResultService.pushOtherReceivableBill(creditResult);
+
                         }
                     }
 
@@ -1856,6 +1954,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         //加装配置手续费(贷款)
         List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos3_2 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "加装配置手续费", "2");
         finSelectedReceivablesDetailedVos3_2.removeAll(Collections.singleton(null));
+        List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos4_1 = finSelectedReceivablesDetailedService.fetchByAuditState1_1(sid, "融资放款", "2");
+        finSelectedReceivablesDetailedVos4_1.removeAll(Collections.singleton(null));
         int carSize = 0;
         //全款推送车款
         if (finSelectedReceivablesDetailedVos1.size() > 0) {
@@ -1980,6 +2080,23 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             carSize = loanInstaConfigFee(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos3_2, freceivebillentry, one, orgCode);
         }
 
+        //融资放款
+        if (finSelectedReceivablesDetailedVos4_1.size() > 0) {
+            boolean one = false;
+            if (finSelectedReceivablesDetailedVos1.size() == 0 &&
+                    finSelectedReceivablesDetailedVos1_1_1.size() == 0 &&
+                    finSelectedReceivablesDetailedVos2.size() == 0 &&
+                    finSelectedReceivablesDetailedVos1_1.size() == 0 &&
+                    finSelectedReceivablesDetailedVos2_1.size() == 0 &&
+                    finSelectedReceivablesDetailedVos1_1_2.size() == 0 &&
+                    finSelectedReceivablesDetailedVos3_1.size() == 0 &&
+                    finSelectedReceivablesDetailedVos3_2.size() == 0 &&
+                    finSelectedReceivablesDetailedVos4_1.size() == 1) {
+                one = true;
+            }
+            carSize = loanDiff(confirmation, arReceivebill, carSize, finSelectedReceivablesDetailedVos4_1, freceivebillentry, one, orgCode);
+        }
+
         //简易订单-订金收取
         if (finSelectedReceivablesDetailedVos1.isEmpty() &&
                 finSelectedReceivablesDetailedVos2.isEmpty() &&
@@ -2026,6 +2143,54 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success();
     }
 
+    private int loanDiff(FinCollectionConfirmation confirmation, ARReceivebill arReceivebill, int carSize, List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos4_1, ARReceivebill.FRECEIVEBILLENTRY freceivebillentry, boolean one, String orgCode) {
+        String sid = confirmation.getSid();
+        List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
+        for (int i = 0; i < finSelectedReceivablesDetailedVos4_1.size(); i++) {
+            FinSelectedReceivablesDetailedVo vvvv = finSelectedReceivablesDetailedVos4_1.get(i);
+            //推送客户
+            String customerNo = createCustomerQuery(2, vvvv, orgCode);
+            //往来单位
+            arReceivebill.setFCONTACTUNIT(customerNo);
+            fEntityList = new ArrayList<>();
+            String uncollSid = "";
+            freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
+            //结算方式
+            freceivebillentry.setFSETTLETYPEIDKey(confirmation.getCollectionTypeKey());
+            freceivebillentry.setFSETTLETYPEIDType("customerPayType");
+            //收款金额
+            freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
+            //登记日期
+            freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
+            if (vvvv.getVIN().length() >= 8) {
+                freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+            }
+            //收款用途
+            freceivebillentry.setFPURPOSEIDKey("001");
+            freceivebillentry.setFPURPOSEIDType("cw_skyt");
+            freceivebillentry.setFACCOUNTID(confirmation.getCollectionBankNum());
+            LoanFinBank loanFinBank = baseMapper.selectFinBnk(vvvv.getContractNo());
+            if(loanFinBank != null){
+                freceivebillentry.setF_PAEZ_Base(loanFinBank.getBankNo());//资方编码
+            }
+            fEntityList.add(freceivebillentry);
+            uncollSid = vvvv.getReceivablesSid();
+            //项目类别key、value
+            arReceivebill.setF_PAEZ_AssistantType("cw_sklb");
+            arReceivebill.setF_PAEZ_AssistantKey("062");
+            arReceivebill.setFRECEIVEBILLENTRY(fEntityList);
+            if (one) {
+                arReceivebill.setFBillNo(confirmation.getBillNo());
+            } else {
+                //单据编号
+                carSize = carSize + 1;
+                arReceivebill.setFBillNo(confirmation.getBillNo() + "-" + carSize);
+            }
+            ResultBean resultBean1 = arReceivebillService.draftArReceivebill(arReceivebill);
+        }
+        return carSize;
+    }
+
     //组装客户推送
     private BdCustomer createBdCustomer(String useOrgSid, String name, String mobile, String customerSid, String collSid) {
         BdCustomer bdCustomer = new BdCustomer();

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java

@@ -98,6 +98,7 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
 
     List<FinSelectedReceivablesDetailedVo> selectListByVin(@Param("contractNo") String contractNo, @Param("busVinSid") String busVinSid, @Param("state") int state);
     List<FinSelectedReceivablesDetailedVo> selectListByVin1(@Param("contractNo") String contractNo, @Param("busVinSid") String busVinSid, @Param("state") int state);
+    List<FinSelectedReceivablesDetailedVo> selectListByVin2(@Param("contractNo") String contractNo, @Param("busVinSid") String busVinSid, @Param("state") int state);
 
     List<FinSelectedReceivablesDetailed> getList(@Param("list") List<String> sidsList);
 

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@@ -209,6 +209,27 @@
         GROUP BY d.`sid`) d
     </select>
 
+    <select id="selectListByVin2"
+            resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo">
+        select ifnull(sum(dbalance), 0) as subscriptionMoney
+        from (SELECT cast((
+        d.`subscriptionMoney` - COALESCE(SUM(f.`thisUseMoney`), 0)) AS DECIMAL(10, 2)) AS dbalance
+        FROM fin_selected_receivables_detailed d
+        left join fin_uncollected_receivables_detailed ff on ff.sid = d.receivablesSid
+        LEFT JOIN (
+        SELECT f.busSid,
+        f.thisUseMoney
+        FROM fin_funds_carried_forward_veh f
+        JOIN `fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+        WHERE fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE d.auditState = #{state}
+        and ff.busVinSid = #{busVinSid}
+        and d.contractNo = #{contractNo}
+        and ff.receivablesName = '融资放款'
+        GROUP BY d.`sid`) d
+    </select>
+
     <select id="getList"
             resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed">
         select *

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -285,6 +285,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         return baseMapper.selectListByVin1(contractNo, busVinSid, state);
     }
 
+    public List<FinSelectedReceivablesDetailedVo> selectListByVin2(String contractNo, String busVinSid, int state) {
+        return baseMapper.selectListByVin2(contractNo, busVinSid, state);
+    }
+
     public List<FinSelectedReceivablesDetailed> getList(List<String> sidsList) {
         return baseMapper.getList(sidsList);
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -108,6 +108,7 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
 
     List<FinUncollectedReceivablesDetailed> selectListByBusVinSid(String busVinSid);
     List<FinUncollectedReceivablesDetailed> selectListByBusVinSid1(String busVinSid);
+    List<FinUncollectedReceivablesDetailed> selectListByBusVinSid2(String busVinSid);
 
     /**
      * 根据销售订单车辆sid更新应收未收的款项状态

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -11,8 +11,8 @@
         from fin_uncollected_receivables_detailed
         <where>
             ${ew.sqlSegment}
-            ORDER BY createTime DESC, id
         </where>
+        ORDER BY createTime DESC, id
     </select>
 
 
@@ -338,6 +338,11 @@
         select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and receivablesName = '首付款及费用'
     </select>
 
+    <select id="selectListByBusVinSid2"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed">
+        select * from fin_uncollected_receivables_detailed where busVinSid = #{busVinSid} and receivablesName = '融资放款'
+    </select>
+
     <update id="updateKxState">
         update fin_uncollected_receivables_detailed set kxState = #{kxState}
         where busVinSid in

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -1021,6 +1021,10 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
         return baseMapper.selectListByBusVinSid1(busVinSid);
     }
 
+    public List<FinUncollectedReceivablesDetailed> selectListByBusVinSid2(String busVinSid) {
+        return baseMapper.selectListByBusVinSid2(busVinSid);
+    }
+
     public ResultBean updateKxState(StateQuery stateQuery) {
         ResultBean rb = ResultBean.fireFail();
         List<String> busVinSid = stateQuery.getBusVinSid();

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancustomerrecord/app/AppSelectObject.java

@@ -21,4 +21,5 @@ public class AppSelectObject {
     private String legalName;
     //地址
     private String registDetailAddress;
+    private String realAddress;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanhomevisitinvestigate/LoanHomeVisitInvestigateInitReportStateVo.java

@@ -9,6 +9,8 @@ public class LoanHomeVisitInvestigateInitReportStateVo implements Vo {
 
     @ApiModelProperty("客户信息")
     private int customerState;
+    @ApiModelProperty("其他补充信息")
+    private int otherState;
     @ApiModelProperty("订单信息")
     private int orderState;
     @ApiModelProperty("运营经历")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.riskcenter.api.loandiff.LoanDiff;
 import com.yxt.anrui.riskcenter.api.loandiff.LoanDiffVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -21,4 +23,8 @@ public interface LoanDiffMapper extends BaseMapper<LoanDiff> {
     int updateFlowFiled(Map<String, Object> map);
 
     IPage<LoanDiffVo> listPageVo(IPage<LoanDiff> page, @Param(Constants.WRAPPER)QueryWrapper<LoanDiff> qw);
+
+    BusSalesOrderVehicle selectByBusVinSid(String busVinSid);
+
+    BusSalesOrder selectByOrderSid(String salesOrderSid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffMapper.xml

@@ -36,4 +36,12 @@
         </where>
         order by ld.id desc
     </select>
+
+    <select id="selectByBusVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from anrui_buscenter.bus_sales_order_vehicle where sid = #{busVinSid}
+    </select>
+
+    <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder">
+        select * from anrui_buscenter.bus_sales_order where sid = #{salesOrderSid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiff/LoanDiffService.java

@@ -6,7 +6,15 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
+import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CapitalCreditResult;
+import com.yxt.anrui.fin.api.kingdee.capitalcreditresult.CwSystemYT;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@@ -16,11 +24,15 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.riskcenter.api.loandiff.*;
 import com.yxt.anrui.riskcenter.api.loandiff.flowable.*;
 import com.yxt.anrui.riskcenter.api.loandiffdetails.*;
+import com.yxt.anrui.riskcenter.api.loansolutions.PushVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplate;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateQuery;
 import com.yxt.anrui.riskcenter.api.loantemplate.LoanTemplateVo;
@@ -42,6 +54,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -70,6 +83,12 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
+    private FinKingDeeFeign finKingDeeFeign;
+    @Autowired
+    private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     /**
      * 判断提交的流程是否被允许
@@ -198,7 +217,8 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-
+                //推送财务其他应收单
+                pushFinOther(businessSid);
             } else {
                 //极光推送
                 loanDiff = fetchBySid(businessSid);
@@ -221,6 +241,91 @@ public class LoanDiffService extends MybatisBaseService<LoanDiffMapper, LoanDiff
         }
     }
 
+    public void pushFinOther(String sid) {
+        List<LoanDiffDetails> list = loanDiffDetailsService.selectDetailsByMainSid(sid);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            for (int i = 0; i < list.size(); i++) {
+                CapitalCreditResult creditResult = new CapitalCreditResult();
+                LoanDiffDetails loanDiffDetails = list.get(i);
+                String busVinSid = loanDiffDetails.getBusVinSid();
+                BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBusVinSid(busVinSid);
+                BusSalesOrder busSalesOrder = baseMapper.selectByOrderSid(busSalesOrderVehicle.getSalesOrderSid());
+                String customerNumber = "";
+                //判断财务系统是否有客户
+                Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+                String linkNo = "";
+                if (!aBoolean) {
+                    BdCustomer bdCustomer = new BdCustomer();
+                    bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+                    bdCustomer.setFShortName(busSalesOrder.getContractNo());
+                    BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(busSalesOrder.getPurchaseSystemSid()).getData();
+                    bdCustomer.setTOrgIds(data.getOrgCode());
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                        String vinNo = busSalesOrderVehicle.getLinkNo();
+                        if (vinNo.length() > 8) {
+                            linkNo = vinNo.substring(vinNo.length() - 8);
+                        } else {
+                            linkNo = busSalesOrderVehicle.getLinkNo();
+                        }
+                        bdCustomer.setFName(busSalesOrderVehicle.getBorrowName() + linkNo);
+                    } else {
+                        bdCustomer.setFName(busSalesOrderVehicle.getBorrowName() + busSalesOrderVehicle.getTemporaryNo());
+                    }
+                    ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+                    if (resultBean.getSuccess()) {
+                        customerNumber = bdCustomer.getFNumber();
+                    }
+                } else {
+                    customerNumber = busSalesOrderVehicle.getTemporaryNo();
+                }
+                creditResult.setCommUnit(customerNumber);
+                SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(busSalesOrder.getUseOrgSid()).getData();
+                creditResult.setCollectionOrg(sysOrganizationVo1.getOrgCode());
+                creditResult.setBussDate(DateUtil.formatDate(new Date()));
+                List<CapitalCreditResult.CapitalCreditResultDetailDto> collectionDetailDtoListOne = new ArrayList<>();
+                SysOrganizationVo sysOrganizationVo2 = sysOrganizationFeign.fetchBySid(busSalesOrder.getOrgSid()).getData();
+                if (loanDiffDetails.getRealityLoan() != null) {//实扣贷款保证金
+                    CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                    creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                    creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityLoanMargin().toString());
+                    creditResultDetailDto.setUseTo(CwSystemYT.BOND_AMOUNTS.getType());
+                    collectionDetailDtoListOne.add(creditResultDetailDto);
+                }
+                if (loanDiffDetails.getRealityDiscount() != null) {//实扣主产品厂家贴息
+                    CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                    creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                    creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityDiscount().toString());
+                    creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                    collectionDetailDtoListOne.add(creditResultDetailDto);
+                }
+                if (loanDiffDetails.getRealityOtherDiscount() != null) {//实扣其他融厂家贴息
+                    CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                    creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                    creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getRealityOtherDiscount().toString());
+                    creditResultDetailDto.setUseTo(CwSystemYT.SANFANG_TIEXI_DIECHEKUAN.getType());
+                    collectionDetailDtoListOne.add(creditResultDetailDto);
+                }
+                if (loanDiffDetails.getReceivedPremium() != null) {//已收意外险
+                    CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                    creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                    creditResultDetailDto.setExTaxMoney("-" + loanDiffDetails.getReceivedPremium().toString());
+                    creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                    collectionDetailDtoListOne.add(creditResultDetailDto);
+                }
+                if (loanDiffDetails.getDiffPremium() != null) {//意外险差额
+                    CapitalCreditResult.CapitalCreditResultDetailDto creditResultDetailDto = new CapitalCreditResult.CapitalCreditResultDetailDto();
+                    creditResultDetailDto.setDearDept(sysOrganizationVo2.getOrgCode());
+                    creditResultDetailDto.setExTaxMoney(loanDiffDetails.getDiffPremium().toString());
+                    creditResultDetailDto.setUseTo(CwSystemYT.PROXY_ACCIDENT_PREMIUM.getType());
+                    collectionDetailDtoListOne.add(creditResultDetailDto);
+                }
+                creditResult.setResultDetails(collectionDetailDtoListOne);
+                finKingDeeFeign.pushOtherReceivableBill(creditResult);
+            }
+        }
+    }
+
     public ResultBean<List<DiffApplyNodeVo>> getPreviousNodesForReject(DiffApplyNodeQuery query) {
         ResultBean<List<DiffApplyNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.java

@@ -18,4 +18,6 @@ public interface LoanDiffDetailsMapper extends BaseMapper<LoanDiffDetails> {
     List<LoanDiffDetailssVo> selectByMainSid(String sid);
 
     List<AppRecords> selectByMainSid2(String sid);
+
+    List<LoanDiffDetails> selectDetailsByMainSid(String sid);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.xml

@@ -29,4 +29,8 @@
         from anrui_riskcenter.loan_diff_details
         where mainSid = #{sid}
     </select>
+
+    <select id="selectDetailsByMainSid" resultType="com.yxt.anrui.riskcenter.api.loandiffdetails.LoanDiffDetails">
+        select * from anrui_riskcenter.loan_diff_details where mainSid = #{sid}
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsService.java

@@ -24,4 +24,8 @@ public class LoanDiffDetailsService extends MybatisBaseService<LoanDiffDetailsMa
     public List<AppRecords> selectByMainSid2(String sid) {
         return baseMapper.selectByMainSid2(sid);
     }
+
+    public List<LoanDiffDetails> selectDetailsByMainSid(String sid) {
+        return baseMapper.selectDetailsByMainSid(sid);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java

@@ -396,6 +396,12 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
             loanHomeVisitInvestigateInitReportStateVo.setCustomerState(0);
         } else {
             loanHomeVisitInvestigateInitReportStateVo.setCustomerState(1);
+            //其他补充信息状态
+            if (StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompName()) || StringUtils.isBlank(loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum())){
+                loanHomeVisitInvestigateInitReportStateVo.setOtherState(0);
+            }else {
+                loanHomeVisitInvestigateInitReportStateVo.setOtherState(1);
+            }
         }
         //订单信息状态
         LoanHomevisitInvestigateOrderDetailsVo loanHomevisitInvestigateOrderDetailsVo = loanHomevisitInvestigateOrderService.selByMainSid(sid);
@@ -1267,6 +1273,7 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         LoanHomevisitInvestigate loanHomevisitInvestigate = fetchBySid(sid);
         LoanHomevisitInvestigateCustomerDetailsVo loanHomevisitInvestigateCustomerDetailsVo = loanHomevisitInvestigateCustomerService.selByMainSid(sid);
         List<FinanceForm> userInfo = new ArrayList<>();
+        List<FinanceForm> otherInfo = new ArrayList<>();
         if (loanHomevisitInvestigateCustomerDetailsVo != null) {
             FinanceForm financeForm1 = new FinanceForm();
             financeForm1.setValue("借款人");
@@ -1418,6 +1425,58 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
                 financeForm25.setValue("关系：" + loanHomevisitInvestigateCustomerDetailsVo.getRelationshipValue());
                 userInfo.add(financeForm25);
             }
+            if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                FinanceForm financeForm60 = new FinanceForm();
+                financeForm60.setValue("车辆登记在：客户下");
+                financeForm60.setSpanSize(2);
+                otherInfo.add(financeForm60);
+            }else if ("2".equals(loanHomevisitInvestigateCustomerDetailsVo.getVehRegis())){
+                FinanceForm financeForm61 = new FinanceForm();
+                financeForm61.setValue("车辆登记在：挂靠公司下");
+                financeForm61.setSpanSize(2);
+                otherInfo.add(financeForm61);
+                FinanceForm financeForm62 = new FinanceForm();
+                financeForm62.setValue("挂靠公司信息");
+                financeForm62.setSpanSize(2);
+                financeForm62.setType(1);
+                financeForm62.setBold(true);
+                otherInfo.add(financeForm62);
+                if ("0".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())){
+                    FinanceForm financeForm63 = new FinanceForm();
+                    financeForm63.setValue("挂靠公司是否担保：是");
+                    financeForm63.setSpanSize(2);
+                    otherInfo.add(financeForm63);
+                }else if ("1".equals(loanHomevisitInvestigateCustomerDetailsVo.getIsSecurity())){
+                    FinanceForm financeForm64 = new FinanceForm();
+                    financeForm64.setValue("挂靠公司是否担保：否");
+                    financeForm64.setSpanSize(2);
+                    otherInfo.add(financeForm64);
+                }
+                FinanceForm financeForm65 = new FinanceForm();
+                financeForm65.setValue("挂靠公司名称：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompName());
+                financeForm65.setSpanSize(2);
+                otherInfo.add(financeForm65);
+                FinanceForm financeForm66 = new FinanceForm();
+                financeForm66.setValue("统一社会信用代码：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompRegistNum());
+                financeForm66.setSpanSize(2);
+                otherInfo.add(financeForm66);
+                FinanceForm financeForm67 = new FinanceForm();
+                financeForm67.setValue("负责人：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompContract());
+                financeForm67.setSpanSize(2);
+                otherInfo.add(financeForm67);
+                FinanceForm financeForm68 = new FinanceForm();
+                financeForm68.setValue("电话：" + loanHomevisitInvestigateCustomerDetailsVo.getAccComphone());
+                financeForm68.setSpanSize(2);
+                otherInfo.add(financeForm68);
+                FinanceForm financeForm69 = new FinanceForm();
+                financeForm69.setValue("注册地址：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompAddress());
+                financeForm69.setSpanSize(2);
+                otherInfo.add(financeForm69);
+                FinanceForm financeForm70 = new FinanceForm();
+                financeForm70.setValue("实际经营地址：" + loanHomevisitInvestigateCustomerDetailsVo.getAccCompxAddress());
+                financeForm70.setSpanSize(2);
+                otherInfo.add(financeForm70);
+            }
         }
         LoanHomevisitInvestigateOperationsDetailsVo loanHomevisitInvestigateOperationsDetailsVo = loanHomevisitInvestigateOperationsService.selByMainSid(sid);
         List<FinanceForm> yYInfo = new ArrayList<>();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@@ -360,10 +360,10 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         String urlAllVo = "";
         List<File> filesList = new ArrayList<>();
         //贷款人生成车辆买卖合同
-        List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
+       /* List<File> xcmmContractUrls = commonContractFeign.xcmmContract(printConfirmDto).getData();
         for (File xcmmContractUrl : xcmmContractUrls) {
             filesList.add(xcmmContractUrl);
-        }
+        }*/
         if (conSetUpKey.equals("001")) {//一车一合同
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -390,7 +390,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 busSalesOrderLoancontractDto.setBusName("资方终审确认");
                 String loanContractSid = busSalesOrderLoancontractFeign.save(busSalesOrderLoancontractDto).getData();
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
-                //生成车辆融资协议
+              /*  //生成车辆融资协议
                 String clrzxyUrl = generateCLRZXY(printConfirmDto);
                 //生成还款协议
                 String hkxyUrl = hkxy(printConfirmDto);
@@ -419,7 +419,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
                 if (StringUtils.isNotBlank(gsgddwdbjy)) {
                     File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                     filesList.add(file);
-                }
+                }*/
             }
         } else if (conSetUpKey.equals("002")) {//一人一合同
             List<SalesOrderVehicle> salesOrderVehicles = new ArrayList<>();
@@ -450,7 +450,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
                 busSalesOrderVehicleFeign.updateXDCon(busSalesOrderVehicle.getSid(), loanContractSid);
             }
-            //生成车辆融资协议
+           /* //生成车辆融资协议
             String clrzxyUrl = generateCLRZXY(printConfirmDto);
             //生成还款协议
             String hkxy = hkxy(printConfirmDto);
@@ -479,7 +479,7 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
             if (StringUtils.isNotBlank(gsgddwdbjy)) {
                 File file = new File(docPdfComponent.getUploadTemplateUrl() + gsgddwdbjy);
                 filesList.add(file);
-            }
+            }*/
         }
         //合并pdf文件
         if (filesList.size() > 0) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -504,6 +504,8 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     baseVehicleDto.setManPurOrderTypeKey(scmVehicleEnterlibrary.getPurchaseTypeKey());
                     baseVehicleDto.setManPurOrderTypeValue(scmVehicleEnterlibrary.getPurchaseType());
                     baseVehicleDto.setOrgPriceDate(scmVehicleEnterlibrary.getInboundDate());
+                    baseVehicleDto.setManufSaleAccessKey("60");
+                    baseVehicleDto.setManufSaleAccessName("外采主车");
                     List<BaseVehicleDto> list = new ArrayList<>();
                     list.add(baseVehicleDto);
                     baseVehicleFeign.saveOrUpdate(list, OperVehicleState.EventType.WC_SAVEVEH.getCode());

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loancustomerrecord/SelectObject.java

@@ -22,5 +22,5 @@ public class SelectObject {
     private String legalName;
     //地址
     private String registDetailAddress;
-
+    private String realAddress;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateDetailsVo.java

@@ -22,6 +22,8 @@ public class AppLoanHomeVisitInvestigateDetailsVo implements Vo {
     private List<AppFinanceForm> zCInfo;
     @ApiModelProperty("订单信息")
     private List<AppFinanceForm> orderInfo;
+    @ApiModelProperty("其他补充信息")
+    private List<AppFinanceForm> otherInfo;
     @ApiModelProperty("通过/不通过")
     private String agree;
     @ApiModelProperty("意见")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitOtherVo.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AppLoanHomeVisitInvestigateInitOtherVo implements Vo {
+
+    private String sid;
+    @ApiModelProperty("1客户下 2挂靠公司下")
+    private String isGK;
+    @ApiModelProperty("是否担保(1是0否)")
+    private String isDb;
+    @ApiModelProperty("挂靠公司名称")
+    private String disName;
+    @ApiModelProperty("挂靠公司统一社会信用代码")
+    private String registNum;
+    @ApiModelProperty("挂靠公司负责人")
+    private String contract;
+    @ApiModelProperty("挂靠公司电话")
+    private String mobile2;
+    @ApiModelProperty("注册地址")
+    private String registDetailAddress;
+    @ApiModelProperty("实际经营地址")
+    private String realAddress;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateInitReportStateVo.java

@@ -9,6 +9,8 @@ public class AppLoanHomeVisitInvestigateInitReportStateVo implements Vo {
 
     @ApiModelProperty("客户信息")
     private String customerState;
+    @ApiModelProperty("其他补充信息")
+    private String otherState;
     @ApiModelProperty("订单信息")
     private String orderState;
     @ApiModelProperty("运营经历")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/AppLoanHomeVisitInvestigateSaveOtherDto.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AppLoanHomeVisitInvestigateSaveOtherDto implements Dto {
+
+    private String sid;
+    @ApiModelProperty("1客户下 2挂靠公司下")
+    private String isGK;
+    @ApiModelProperty("是否担保")
+    private String isDb;
+    @ApiModelProperty("挂靠公司名称")
+    private String disName;
+    @ApiModelProperty("挂靠公司统一社会信用代码")
+    private String registNum;
+    @ApiModelProperty("挂靠公司负责人")
+    private String contract;
+    @ApiModelProperty("挂靠公司电话")
+    private String mobile2;
+    @ApiModelProperty("注册地址")
+    private String registDetailAddress;
+    @ApiModelProperty("实际经营地址")
+    private String realAddress;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateFeign.java

@@ -74,6 +74,16 @@ public interface LoanHomeVisitInvestigateFeign {
     @ResponseBody
     public ResultBean saveHomeVisitCustomerInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveCustomerDto dto);
 
+    @ApiOperation("初始化其他补充信息")
+    @GetMapping("/getHomeVisitOhterInfo")
+    @ResponseBody
+    public ResultBean<AppLoanHomeVisitInvestigateInitOtherVo> getHomeVisitOhterInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("保存其他补充信息")
+    @PostMapping("/saveHomeVisitOherInfo")
+    @ResponseBody
+    public ResultBean saveHomeVisitOherInfo(@Valid @RequestBody AppLoanHomeVisitInvestigateSaveOtherDto dto);
+
     @ApiOperation("初始化家访考察订单信息")
     @GetMapping("/getHomeVisitOrderInfo")
     @ResponseBody

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateRest.java

@@ -89,6 +89,16 @@ public class LoanHomeVisitInvestigateRest implements LoanHomeVisitInvestigateFei
         return loanHomeVisitInvestigateService.saveHomeVisitCustomerInfo(dto);
     }
 
+    @Override
+    public ResultBean<AppLoanHomeVisitInvestigateInitOtherVo> getHomeVisitOhterInfo(String sid) {
+        return loanHomeVisitInvestigateService.getHomeVisitOhterInfo(sid);
+    }
+
+    @Override
+    public ResultBean saveHomeVisitOherInfo(AppLoanHomeVisitInvestigateSaveOtherDto dto) {
+        return loanHomeVisitInvestigateService.saveHomeVisitOherInfo(dto);
+    }
+
     @Override
     public ResultBean<AppLoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
         return loanHomeVisitInvestigateService.getHomeVisitOrderInfo(sid);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/loanhomevisitinvestigate/LoanHomeVisitInvestigateService.java

@@ -37,6 +37,8 @@ import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeV
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateoperations.LoanHomeVisitInvestigateInitOperVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateSaveOrderDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateorder.LoanHomeVisitInvestigateInitOrderVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateInitOtherPeoVo;
+import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomeVisitInvestigateSaveOtherPeoDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateSavePropDto;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateproperty.LoanHomeVisitInvestigateInitPropVo;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatetransport.LoanHomeVisitInvestigateSaveTranDto;
@@ -201,6 +203,65 @@ public class LoanHomeVisitInvestigateService {
         return rb.success();
     }
 
+    public ResultBean<AppLoanHomeVisitInvestigateInitOtherVo> getHomeVisitOhterInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateInitCustomerVo data = loanHomevisitInvestigateFeign.getHomeVisitCustomerInfo(sid).getData();
+        AppLoanHomeVisitInvestigateInitOtherVo appLoanHomeVisitInvestigateInitOtherVo = new AppLoanHomeVisitInvestigateInitOtherVo();
+        if (data != null){
+            appLoanHomeVisitInvestigateInitOtherVo.setSid(sid);
+            appLoanHomeVisitInvestigateInitOtherVo.setIsGK(data.getVehRegis());
+            if ("0".equals(data.getIsSecurity())){
+                appLoanHomeVisitInvestigateInitOtherVo.setIsDb("1");
+            }else if ("1".equals(data.getIsSecurity())){
+                appLoanHomeVisitInvestigateInitOtherVo.setIsDb("0");
+            }
+            appLoanHomeVisitInvestigateInitOtherVo.setDisName(data.getAccCompName());
+            appLoanHomeVisitInvestigateInitOtherVo.setRegistNum(data.getAccCompRegistNum());
+            appLoanHomeVisitInvestigateInitOtherVo.setContract(data.getAccCompContract());
+            appLoanHomeVisitInvestigateInitOtherVo.setMobile2(data.getMobile());
+            appLoanHomeVisitInvestigateInitOtherVo.setRegistDetailAddress(data.getAccCompAddress());
+            appLoanHomeVisitInvestigateInitOtherVo.setRealAddress(data.getAccCompxAddress());
+        }else {
+            return rb.setMsg("请优先完善客户信息");
+        }
+        return rb.success().setData(appLoanHomeVisitInvestigateInitOtherVo);
+    }
+
+    public ResultBean saveHomeVisitOherInfo(AppLoanHomeVisitInvestigateSaveOtherDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        LoanHomeVisitInvestigateSaveCustomerDto loanHomeVisitInvestigateSaveCustomerDto = new LoanHomeVisitInvestigateSaveCustomerDto();
+        LoanHomeVisitInvestigateInitCustomerVo data = loanHomevisitInvestigateFeign.getHomeVisitCustomerInfo(dto.getSid()).getData();
+        if (data != null){
+            BeanUtil.copyProperties(data,loanHomeVisitInvestigateSaveCustomerDto);
+            List<LoanHomeVisitInvestigateInitOtherPeoVo> otherPersonnel = data.getOtherPersonnel();
+            List<LoanHomeVisitInvestigateSaveOtherPeoDto> loanHomeVisitInvestigateSaveOtherPeoDtos = new ArrayList<>();
+            if (otherPersonnel != null && otherPersonnel.size() > 0){
+                for (LoanHomeVisitInvestigateInitOtherPeoVo loanHomeVisitInvestigateInitOtherPeoVo : otherPersonnel) {
+                    LoanHomeVisitInvestigateSaveOtherPeoDto loanHomeVisitInvestigateSaveOtherPeoDto = new LoanHomeVisitInvestigateSaveOtherPeoDto();
+                    BeanUtil.copyProperties(loanHomeVisitInvestigateInitOtherPeoVo,loanHomeVisitInvestigateSaveOtherPeoDto);
+                    loanHomeVisitInvestigateSaveOtherPeoDtos.add(loanHomeVisitInvestigateSaveOtherPeoDto);
+                }
+                loanHomeVisitInvestigateSaveCustomerDto.setOtherPersonnel(loanHomeVisitInvestigateSaveOtherPeoDtos);
+            }
+            loanHomeVisitInvestigateSaveCustomerDto.setVehRegis(dto.getIsGK());
+            if ("0".equals(dto.getIsDb())){
+                loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity("1");
+            }else if ("1".equals(dto.getIsDb())){
+                loanHomeVisitInvestigateSaveCustomerDto.setIsSecurity("0");
+            }
+            loanHomeVisitInvestigateSaveCustomerDto.setAccCompName(dto.getDisName());
+            loanHomeVisitInvestigateSaveCustomerDto.setAccCompRegistNum(dto.getRegistNum());
+            loanHomeVisitInvestigateSaveCustomerDto.setAccCompContract(dto.getContract());
+            loanHomeVisitInvestigateSaveCustomerDto.setMobile(dto.getMobile2());
+            loanHomeVisitInvestigateSaveCustomerDto.setAccCompAddress(dto.getRegistDetailAddress());
+            loanHomeVisitInvestigateSaveCustomerDto.setAccCompxAddress(dto.getRealAddress());
+        }else {
+            return rb.setMsg("请优先完善客户信息");
+        }
+        loanHomevisitInvestigateFeign.saveHomeVisitCustomerInfo(loanHomeVisitInvestigateSaveCustomerDto);
+        return rb.success();
+    }
+
     public ResultBean<AppLoanHomeVisitInvestigateInitOrderVo> getHomeVisitOrderInfo(String sid) {
         ResultBean rb = ResultBean.fireFail();
         LoanHomeVisitInvestigateInitOrderVo data = loanHomevisitInvestigateFeign.getHomeVisitOrderInfo(sid).getData();