Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1487,6 +1487,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             finKingDeeFeign.draftBdCustomer(bdMiddle);
         }
         //主车
+        int j = 0;
         for (BaseVehicleZSOutDto dto : zcDtos) {
             String vinSid = dto.getVinSid();
             BaseVehicle baseVehicle1 = baseVehicleService.fetchBySid(vinSid);
@@ -1620,7 +1621,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 baseVehicle1.setSalePrice(Integer.valueOf(dto.getPrice()));
             }
             baseVehicleService.updateById(baseVehicle1);
-            int j = 0;
             if (!"001".equals(payTypeKey)) {//贷款
                 try {
                     if (j != 0) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -135,6 +135,8 @@ public class AppBusSalesOrderVo implements Vo {
     private boolean showApplyBtn;
     @ApiModelProperty("是否显示录入车架号")
     private boolean showInputBtn;
+    @ApiModelProperty("是否显示贷款人确定按钮")
+    private boolean showBorrowBtn;
 
     private boolean showRePublishBtn;
     @ApiModelProperty("车型信息")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -715,6 +715,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         ResultBean rb = ResultBean.fireFail();
         String businessSid = bv.getBusinessSid();
         FinBillApplication finBillApplication = fetchBySid(businessSid);
+        bv.setModelId(finBillApplication.getProcDefId());
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("sid", businessSid);
@@ -918,7 +919,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if ("003".equals(finBillApplication.getBillStateKey())) {
             bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
         } else {
-            bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
+            bv.setModelId(finBillApplication.getProcDefId());
         }
         String contractNo = finBillApplication.getContractNo();
         //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加
@@ -955,7 +956,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         if ("003".equals(finBillApplication.getBillStateKey())) {
             bv.setModelId(ProcDefEnum.QKFINBILLAPPLICATION.getProDefId());
         } else {
-            bv.setModelId(ProcDefEnum.FINBILLAPPLICATION.getProDefId());
+            bv.setModelId(finBillApplication.getProcDefId());
         }
         String contractNo = finBillApplication.getContractNo();
         //判断是否担保贷款，若是，则isdbdk网关参数为true=============添加

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -14,7 +14,7 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
-    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:3:2430004"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:4:4505004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:1:1735004"),
     QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:4:1592512"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"),

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultDto.java

@@ -63,6 +63,4 @@ public class LoanCapitalCreditResultDto implements Dto {
     private String bankContractNo;
 	@ApiModelProperty("销售订单消贷合同sid")
     private String loanContractSid; // 销售订单消贷合同sid
-    @ApiModelProperty("信审附件")
-    private List<String> xsImages;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeign.java

@@ -61,12 +61,12 @@ public interface LoanCapitalCreditResultFeign {
     @ResponseBody
     public ResultBean<PagerVo<LoanCapitalCreditResultVo>> listPage(@RequestBody PagerQuery<LoanCapitalCreditResultQuery> pq);
 
-    @ApiOperation("保存附件---作废")
+    @ApiOperation("保存附件")
     @PostMapping("/saveImages")
     @ResponseBody
-    public ResultBean saveImages(@RequestBody List<String> images, @RequestParam("sid") String sid);
+    public ResultBean saveImages(@RequestBody LoanCapitalCreditResultFjDto loanCapitalCreditResultFjDto);
 
-    @ApiOperation("查看附件---作废")
+    @ApiOperation("查看附件")
     @PostMapping("/selectImages")
     @ResponseBody
     public ResultBean<List<String>> selectImages(@RequestParam("sid") String sid);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFeignFallback.java

@@ -55,7 +55,7 @@ public class LoanCapitalCreditResultFeignFallback implements LoanCapitalCreditRe
 	}
 
 	@Override
-	public ResultBean saveImages(List<String> images, String sid) {
+	public ResultBean saveImages(LoanCapitalCreditResultFjDto loanCapitalCreditResultFjDto) {
 		return null;
 	}
 

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultFjDto.java

@@ -0,0 +1,56 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loancapitalcreditresult;
+
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(资方信审终审结果反馈) <br/>
+ * File: LoanCapitalCreditResultDto.java <br/>
+ * Class: com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto <br/>
+ * Description: 资方信审终审结果反馈 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2023-08-25 11:06:15 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "资方信审终审结果反馈 数据传输对象", description = "资方信审终审结果反馈 数据传输对象")
+public class LoanCapitalCreditResultFjDto implements Dto {
+
+    private String sid;
+    @ApiModelProperty("信审附件")
+    private List<String> xsImages;
+}

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loancapitalcreditresult/LoanCapitalCreditResultVo.java

@@ -79,6 +79,4 @@ public class LoanCapitalCreditResultVo implements Vo {
     private String bankContractNo;
     @ApiModelProperty("销售订单消贷合同sid")
     private String loanContractSid;
-    @ApiModelProperty("信审附件")
-    private List<String> xsImages;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanOrderPreloanVo.java

@@ -16,5 +16,10 @@ public class LoanOrderPreloanVo implements Vo {
     private String customerName;
     @ApiModelProperty("台数")
     private String quantity;
+    @ApiModelProperty("按钮：信用审核、当为等待中时为我知道了、信用申诉")
+    private String confirmBtn;
+    @ApiModelProperty("页面地址")
+    private String pluginPage;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java

@@ -61,6 +61,8 @@ public class CalculateQuery {
     private String otherPolicyPeriod;
     @ApiModelProperty("其它融年利率")
     private String otherPolicyYearRatio;
+    @ApiModelProperty("其他融sid")
+    private String otherPolicySid;
 
 
     /*********************************金融方案费用明细*****************************/

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultMapper.java

@@ -64,7 +64,7 @@ public interface LoanCapitalCreditResultMapper extends BaseMapper<LoanCapitalCre
     @Select("select * from loan_capital_credit_result")
     List<LoanCapitalCreditResultVo> selectListVo();
 
-    @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},state = '2' where sid = #{dtoSid")
+    @Update("update loan_capital_credit_result set capCarefulDate = #{capCarefulDate},capCarefulResult = #{capCarefulResult},state = '2' where sid = #{dtoSid}")
     void updateStateAndDateResult(@Param("dtoSid") String dtoSid, @Param("capCarefulDate") String capCarefulDate, @Param("capCarefulResult") String capCarefulResult);
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.riskcenter.biz.loancapitalcreditresult;
 
+import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -35,13 +36,6 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResult;
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultQuery;
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultVo;
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDetailsVo;
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultDto;
-import com.yxt.anrui.riskcenter.api.loancapitalcreditresult.LoanCapitalCreditResultFeign;
-
 /**
  * Project: anrui-riskcenter(资方信审终审结果反馈) <br/>
  * File: LoanCapitalCreditResultFeignFallback.java <br/>
@@ -73,8 +67,8 @@ public class LoanCapitalCreditResultRest implements LoanCapitalCreditResultFeign
     }
 
     @Override
-    public ResultBean saveImages(List<String> images, String sid) {
-        return loanCapitalCreditResultService.saveImages(images, sid);
+    public ResultBean saveImages(LoanCapitalCreditResultFjDto loanCapitalCreditResultFjDto) {
+        return loanCapitalCreditResultService.saveImages(loanCapitalCreditResultFjDto.getXsImages(), loanCapitalCreditResultFjDto.getSid());
     }
 
     @Override
@@ -86,9 +80,7 @@ public class LoanCapitalCreditResultRest implements LoanCapitalCreditResultFeign
     @ApiOperation("新增或修改")
     @PostMapping("/save")
     public ResultBean save(@RequestBody LoanCapitalCreditResultDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-        loanCapitalCreditResultService.saveOrUpdateDto(dto);
-        return rb.success();
+        return loanCapitalCreditResultService.saveOrUpdateDto(dto);
     }
 
     @Override

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancapitalcreditresult/LoanCapitalCreditResultService.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.riskcenter.biz.loancapitalcreditresult;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.yxt.anrui.buscenter.api.bussalesorderloancontract.BusSalesOrderLoancontractFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -156,40 +157,24 @@ public class LoanCapitalCreditResultService extends MybatisBaseService<LoanCapit
         }
         IPage<LoanCapitalCreditResult> page = PagerUtil.queryToPage(pq);
         IPage<LoanCapitalCreditResultVo> pagging = baseMapper.selectPageVo(page, qw);
-        for (LoanCapitalCreditResultVo record : pagging.getRecords()) {
-            List<LoanHomevisitInvestigateFileDetailsVo> xsfjFileVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(record.getSid(), LoanAttachTypeEnum.XSFJ.getAttachType());
-            List<String> xsfjImages = new ArrayList<>();
-            if (xsfjFileVos != null && xsfjFileVos.size() > 0) {
-                for (LoanHomevisitInvestigateFileDetailsVo xsfjFileVo : xsfjFileVos) {
-                    xsfjImages.add(xsfjFileVo.getFileUrl());
-                }
-            }
-            record.setXsImages(xsfjImages);
-        }
         PagerVo<LoanCapitalCreditResultVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public void saveOrUpdateDto(LoanCapitalCreditResultDto dto) {
+    public ResultBean saveOrUpdateDto(LoanCapitalCreditResultDto dto) {
+        ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return;
+            return rb.success();
         }
-        List<String> xsImages = dto.getXsImages();
-        loanHomevisitInvestigateFileService.delByMainSidAndType(dtoSid, LoanAttachTypeEnum.XSFJ.getAttachType());
-        for (String xsImage : xsImages) {
-            LoanHomevisitInvestigateFileDto loanHomevisitInvestigateFileDto = new LoanHomevisitInvestigateFileDto();
-            loanHomevisitInvestigateFileDto.setMainSid(dtoSid);
-            loanHomevisitInvestigateFileDto.setAttachType(LoanAttachTypeEnum.XSFJ.getAttachType());
-            if (xsImage.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
-                xsImage = xsImage.replace(fileUploadComponent.getUrlPrefix(), "");
-            }
-            loanHomevisitInvestigateFileDto.setFileUrl(xsImage);
-            loanHomevisitInvestigateFileService.saveOrUpdateDto(loanHomevisitInvestigateFileDto);
+        List<LoanHomevisitInvestigateFileDetailsVo> loanHomevisitInvestigateFileDetailsVos = loanHomevisitInvestigateFileService.selByMainSidAndTypeKey(dtoSid, LoanAttachTypeEnum.XSFJ.getAttachType());
+        if (loanHomevisitInvestigateFileDetailsVos == null || loanHomevisitInvestigateFileDetailsVos.size() == 0){
+            return rb.setMsg("请上传附件");
         }
         baseMapper.updateStateAndDateResult(dtoSid, dto.getCapCarefulDate(), dto.getCapCarefulResult());
         busSalesOrderLoancontractFeign.updateBankConAndBusNo(dto.getLoanContractSid(), dto.getBankContractNo());
+        return rb.success();
     }
 
     public void insertByDto(LoanCapitalCreditResultDto dto) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitappeal/LoanHomevisitAppealService.java

@@ -196,6 +196,9 @@ public class LoanHomevisitAppealService extends MybatisBaseService<LoanHomevisit
 		qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
 				apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
 				);
+		if (StringUtils.isNotBlank(query.getNames())){
+			qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames()));
+		}
 		IPage<LoanHomevisitAppeal> page = PagerUtil.queryToPage(pq);
 		IPage<LoanHomevisitAppealVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<LoanHomevisitAppealVo> p = PagerUtil.pageToVo(pagging, null);

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

@@ -124,7 +124,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
     public PagerVo<LoanHomevisitInvestigateVo> listPageVo(PagerQuery<LoanHomevisitInvestigateQuery> pq) {
         LoanHomevisitInvestigateQuery query = pq.getParams();
         QueryWrapper<LoanHomevisitInvestigate> qw = new QueryWrapper<>();
-        qw.eq("li.state", query.getType());
+        if (StringUtils.isNotBlank(query.getType())){
+            qw.eq("li.state", query.getType());
+        }
         if ("1".equals(query.getType())) {
             qw.eq("bb.busNo", 302);
         }
@@ -198,6 +200,9 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService<LoanHome
         qw.apply(StringUtils.isNotBlank(resHomeVisStartDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') >= date_format('" + resHomeVisStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(resHomeVisEndDate), "date_format (li.resHomeVisDate,'%Y-%m-%d') <= date_format('" + resHomeVisEndDate + "','%Y-%m-%d')"
                 );
+        if (StringUtils.isNotBlank(query.getNames())){
+            qw.and(wrapper -> wrapper.like("bo.contractNo", query.getNames()).or().like("bb.borrowerName", query.getNames()).or().like("li.homeVisStaffName", query.getNames()));
+        }
         IPage<LoanHomevisitInvestigate> page = PagerUtil.queryToPage(pq);
         IPage<LoanHomevisitInvestigateVo> pagging = baseMapper.selectPageVo(page, qw);
         for (LoanHomevisitInvestigateVo record : pagging.getRecords()) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml

@@ -22,7 +22,7 @@
     </select>
 
     <select id="getOrderLoanPagerList" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo">
-        select la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
+        select distinct(la.idCard),la.custSid,la.custName,DATE_FORMAT(la.createTime, '%Y-%m-%d') as createTime,la.phone,la.gsfkjg,la.capitalName,
         la.zffkjg,
         la.capitalName,
         lp.peoName
@@ -41,13 +41,14 @@
                 , '%')
             </if>
         </where>
+        order by id desc
     </select>
 
     <select id="judgeIsLoan" resultType="com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApply">
         select la.* from
         loan_preloan_credit_apply la
         left join anrui_buscenter.bus_sales_order bo on bo.customerSid = la.custSid
-        where bo.sid = #{sid}
+        where bo.sid = #{sid} and la.state = 0
         order by la.createTime desc limit 1
     </select>
 

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@@ -561,9 +561,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             if (StringUtils.isNotBlank(query.getIdCard())) {
                 qw.like("la.idCard", query.getIdCard());
             }
+            qw.eq("la.isDelete", 0);
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
-        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw,query.getName());
+        IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());
         PagerVo<LoanPreloanVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -574,10 +575,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
         LoanPreloanCreditApply loanPreloanCreditApply = baseMapper.judgeIsLoan(sid);
         LoanOrderPreloanVo loanOrderPreloanVo = baseMapper.judgeIsLoan2(sid);
         if (loanPreloanCreditApply == null) {
+            loanOrderPreloanVo.setConfirmBtn("信用审核");
             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
         } else {
             if (StringUtils.isNotBlank(loanPreloanCreditApply.getGsfkjgKey())) {
                 if (loanPreloanCreditApply.getState() != 2 && "001".equals(loanPreloanCreditApply.getGsfkjgKey())) {
+                    loanOrderPreloanVo.setConfirmBtn("我知道了");
                     return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
                 } else {
                     if ("002".equals(loanPreloanCreditApply.getGsfkjgKey())) {
@@ -587,9 +590,11 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                             if ("已办结".equals(loanCreditAppealApply.getNodeState())) {
                                 return rb.success();
                             } else {
+                                loanOrderPreloanVo.setConfirmBtn("信用申诉");
                                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                             }
                         } else {
+                            loanOrderPreloanVo.setConfirmBtn("信用申诉");
                             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人贷前信用审核未通过！");
                         }
                     } else {
@@ -597,6 +602,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                     }
                 }
             } else {
+                loanOrderPreloanVo.setConfirmBtn("我知道了");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
             }
         }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -1356,6 +1356,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if (StringUtils.isBlank(otherPolicyAmount)) {
                 return rb.setMsg("其他融贷款金额不能为空");
             }
+
             if (StringUtils.isBlank(otherPolicyPeriod)) {
                 otherPolicyPeriod = "0";
             }
@@ -1383,7 +1384,44 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         downPayAmountsRatio = loanDownPay.divide(loanTotal, 4, BigDecimal.ROUND_CEILING).multiply(new BigDecimal("100"));
         downPayAmountsRatio = downPayAmountsRatio.setScale(0, BigDecimal.ROUND_HALF_UP);
         calculateVo.setDownPayAmountsRatio(downPayAmountsRatio.toString());
-        //
+        if (otherPolicyState) {//包含
+            //验证贷款金额是否不大于最高贷款金额
+            LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
+            if (loanFinOtherPolicy != null) {
+                if (loanFinOtherPolicy.getMaxLoanAmount() != null && loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                    //根据最高融资比例计算最高融资额
+                    BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                    BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
+                    if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
+                        if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+                    } else {
+                        if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
+                            if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        } else {//maxLoanAmountRat与贷款金额作对比
+                            if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        }
+                    }
+                } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
+                    if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                    }
+
+                } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                    //根据最高融资比例计算最高融资额
+                    BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                    if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                    }
+                }
+            }
+        }
+
         BigDecimal downPayRatioLeast = loanFinPolicy.getDownPayRatioLeast();
         if (downPayAmountsRatio.compareTo(downPayRatioLeast) < 0) {
             return rb.setMsg("实际首付比例不能低于产品政策中的最低首付比例");

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -303,7 +303,7 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto);
 
-    @ApiOperation("App销售订单分页列表")
+    @ApiOperation("App销售订单查询")
     @PostMapping("/getSaleOrdersByOrgPath")
     @ResponseBody
     public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(@RequestBody PagerQuery<BusOrderQuery> pq);
@@ -318,10 +318,5 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean agreeSaleOrderInfoBy(@RequestBody SaleOrderQueryBy dto);
 
-    @ApiOperation("销售订单点击贷款人确定")
-    @GetMapping("/judgeIsLoan")
-    @ResponseBody
-    ResultBean<OrderLoanVo> judgeIsLoan(@RequestParam("sid")String sid);
-
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java

@@ -283,9 +283,4 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean agreeSaleOrderInfoBy(SaleOrderQueryBy dto) {
         return null;
     }
-
-    @Override
-    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
-        return null;
-    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -97,6 +97,8 @@ public class BusOrderSalesVo implements Vo {
     private boolean showApplyBtn;
     @ApiModelProperty("是否显示录入车架号")
     private boolean showInputBtn;
+    @ApiModelProperty("是否显示贷款人确定按钮")
+    private boolean showBorrowBtn;
 
     private boolean showRePublishBtn;
     @ApiModelProperty("车型信息")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsVo.java

@@ -49,6 +49,8 @@ public class CreditReviewDetailsVo implements Vo {
     private String managementSid;
     @ApiModelProperty("模板下载地址")
     private String downUrl;
+    @ApiModelProperty("发起的来源  0单独发起 1意向 2销售订单")
+    private int createSource = 0;
     @ApiModelProperty("风控要求的其他人员")
     private List<ShareholderDetailsVo> shareholderList = new ArrayList<>();
     private List<IdentityDetailsVo> identity = new ArrayList<>();

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -376,9 +376,4 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.agreeSaleOrderInfoBy(dto);
     }
 
-    @Override
-    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
-        return appBusSalesOrderService.judgeIsLoan(sid);
-    }
-
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -719,16 +719,4 @@ public class AppBusSalesOrderService {
         }
         return rb.success().setData(resultBean.getData()).setMsg(resultBean.getMsg());
     }
-
-    public ResultBean<OrderLoanVo> judgeIsLoan(String sid) {
-        ResultBean<OrderLoanVo> rb = ResultBean.fireFail();
-        ResultBean<LoanOrderPreloanVo> resultBean = loanPreloanCreditApplyFeign.judgeIsLoan(sid);
-        if (!resultBean.getSuccess()) {
-            OrderLoanVo orderLoanVo = new OrderLoanVo();
-            LoanOrderPreloanVo loanOrderPreloanVo = resultBean.getData();
-            BeanUtil.copyProperties(loanOrderPreloanVo, orderLoanVo);
-            return rb.setMsg(resultBean.getMsg()).setData(orderLoanVo);
-        }
-        return rb.success();
-    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
 import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationQuery;
 import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationVo;
 import com.yxt.anrui.fin.api.finbillapplication.flowable.FinBillNodeQuery;
@@ -28,9 +30,13 @@ import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPo
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.LoanFinOtherPolicyRecordApplyFeign;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyCompleteDto;
 import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.flow.LoanOtherPolicyApplyTaskQuery;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyFeign;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.*;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDetailsVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditpeo.LoanPreloanCreditPeoDto;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageQuery;
 import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
 import com.yxt.anrui.terminal.api.risk.creditreview.*;
@@ -77,6 +83,12 @@ public class CreditReviewService {
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
     @Autowired
     private LoanFinBankFeign loanFinBankFeign;
+    @Autowired
+    private BusSalesOrderFeign busSalesOrderFeign;
+    @Autowired
+    private LoanSolutionsFeign loanSolutionsFeign;
+    @Autowired
+    private LoanFinPolicyFeign loanFinPolicyFeign;
 
     public ResultBean<CreditReviewDetailsVo> initCreditReviewInfo(CreditReviewDetailsQuery query) {
         ResultBean rb = ResultBean.fireFail();
@@ -94,7 +106,23 @@ public class CreditReviewService {
             } else if (query.getCreateSource() == 1) {//意向车型发起
 
             } else if (query.getCreateSource() == 2) {//销售订单发起
-
+                BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(query.getSourceSid()).getData();
+                SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData();
+                SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData();
+                creditReviewDetailsVo.setUserSid(query.getUserSid());
+                creditReviewDetailsVo.setOrgPath(query.getOrgPath());
+                creditReviewDetailsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName());
+                creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date()));
+                creditReviewDetailsVo.setCustomerTypeKey(busSalesOrder.getCustomerClassKey());
+                creditReviewDetailsVo.setCustomerType(busSalesOrder.getCustomerClass());
+                creditReviewDetailsVo.setCreateSource(query.getCreateSource());
+                creditReviewDetailsVo.setLegalPersonSid(busSalesOrder.getCustomerSid());
+                creditReviewDetailsVo.setLegalPersonName(busSalesOrder.getCustomerName());
+                creditReviewDetailsVo.setLegalPersonMobile(busSalesOrder.getMobile());
+                SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(query.getSourceSid()).getData();
+                LoanFinPolicyVo loanFinPolicyVo = loanFinPolicyFeign.details(solutionsDetailsVo.getPolicySid()).getData();
+                creditReviewDetailsVo.setManagementSid(loanFinPolicyVo.getBankSid());
+                creditReviewDetailsVo.setManagementName(loanFinPolicyVo.getBankShortName());
             }
         } else {//修改回显
             LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData();

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

@@ -347,7 +347,7 @@ public class LoanHomeVisitInvestigateService {
             LoanHomeVisitInvestigatePageVo loanHomeVisitInvestigatePageVo = new LoanHomeVisitInvestigatePageVo();
             loanHomeVisitInvestigatePageVo.setSid(record.getSid());
             loanHomeVisitInvestigatePageVo.setContractId(record.getContractNo());
-            loanHomeVisitInvestigatePageVo.setSalesName(record.getStaffName());
+            loanHomeVisitInvestigatePageVo.setSalesName(record.getUseOrgName() + "-" + record.getOrgName() + "-" + record.getStaffName());
             loanHomeVisitInvestigatePageVo.setCreateDate(record.getCreateDate());
             loanHomeVisitInvestigatePageVo.setLenderName(record.getBorrowerName());
             loanHomeVisitInvestigatePageVo.setMobile(record.getMobile());