Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
@@ -250,6 +251,11 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean<VinVo> saleOrderInputVin(@PathVariable("saleOrderSid") String saleOrderSid);
 
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/saleOrderInputVin2/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<VinVo2> saleOrderInputVin2(@PathVariable("saleOrderSid") String saleOrderSid);
+
     @ApiOperation("采购订单编号list")
     @GetMapping("/getList/{saleOrderSid}")
     @ResponseBody

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
@@ -226,6 +227,11 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<String>> getList(String saleOrderSid) {
         return null;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class VinListVo2 {
+
+    @ApiModelProperty("贷款人")
+    private String borrowName;
+    private String borrowSid;
+    private List<VinListVo> vinList;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinVo2.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.vin;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class VinVo2 {
+
+    private String saleOrderSid;
+
+    private List<VinListVo2> vinList;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicle.java

@@ -65,5 +65,9 @@ public class BusSalesOrderVehicle extends BaseEntity {
     private String temporaryNo;
     @ApiModelProperty("临时客户名称")
     private String temporaryName;
+    @ApiModelProperty("贷款人sid")
+    private String borrowerSid;
+    @ApiModelProperty("贷款人")
+    private String borrowName;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -57,6 +57,7 @@
         when 0 then '否'
         when 1 then '是' end as insuranceInfo,
         if(bo.nodeState = '已办结', true, false) as showStopBtn,
+        if(bo.nodeState = '已办结', true, false) as showBorrowBtn,
         bo.nodeState is null as showUpdateBtn,
         bo.nodeState is null as showDeleteBtn,
         0 as showFinancialBtn,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -34,6 +34,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
@@ -301,6 +302,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return busSalesOrderService.saleOrderInputVin(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
+        return busSalesOrderService.saleOrderInputVin2(saleOrderSid);
+    }
+
     @Override
     public ResultBean<List<String>> getList(String saleOrderSid) {
         return busSalesOrderService.getList(saleOrderSid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2099,6 +2099,17 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             } else {
                 record.setShowContractBtn(false);
             }
+            //ToDo:需考虑家访准备是否存在该贷款人，若存在，则不允许修改贷款人，即确定贷款人按钮不显示。
+            if (record.isShowBorrowBtn()) {
+                //为现车类型且不确定车架号的，
+                if ("1".equals(record.getType())) {
+                    if (StringUtils.isNotBlank(record.getNowCarUnknownVinNum()) && "0".equals(record.getNowCarUnknownVinNum())) {
+                        record.setShowBorrowBtn(true);
+                    } else {
+                        record.setShowBorrowBtn(false);
+                    }
+                }
+            }
 
 
         }
@@ -7258,4 +7269,56 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         }
         return rb.success().setData(busSalesOrdersVo);
     }
+
+    public ResultBean<VinVo2> saleOrderInputVin2(String saleOrderSid) {
+        ResultBean<VinVo2> rb = ResultBean.fireFail();
+        VinVo2 vinVo = new VinVo2();
+        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid);
+        busSalesOrderVehicleList.removeAll(Collections.singleton(null));
+        List<String> borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList());
+        List<VinListVo2> vinList = new ArrayList<>();
+        for (int j = 0; j < borrowSidList.size(); j++) {
+            VinListVo2 vinListVo2 = new VinListVo2();
+            String borrowSid = borrowSidList.get(j);
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
+            String borrowName = busSalesOrderVehicle.getBorrowName();
+            vinListVo2.setBorrowName(borrowName);
+            vinListVo2.setBorrowSid(borrowSid);
+            busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
+            busSalesOrderVehicleList.removeAll(Collections.singleton(null));
+            if (!busSalesOrderVehicleList.isEmpty()) {
+                List<VinListVo> vinList2 = new ArrayList<>();
+                for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
+                    busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
+                    VinListVo vinListVo = new VinListVo();
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                        vinListVo.setLinkNo(busSalesOrderVehicle.getLinkNo());
+                    }
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                        vinListVo.setLinkSid(busSalesOrderVehicle.getLinkSid());
+                    }
+                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                        //根据车架号查询是否已出库
+                        ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(busSalesOrderVehicle.getLinkSid());
+                        if (baseVehicleResultBean.getSuccess()) {
+                            BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
+                            if (vo != null) {
+                                if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
+                                    vinListVo.setState(true);
+                                } else {
+                                    vinListVo.setState(false);
+                                }
+                            }
+                        }
+                    }
+                    vinList2.add(vinListVo);
+                }
+                vinListVo2.setVinList(vinList2);
+            }
+            vinList.add(vinListVo2);
+        }
+        vinVo.setSaleOrderSid(saleOrderSid);
+        vinVo.setVinList(vinList);
+        return rb.success().setData(vinVo);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java

@@ -29,6 +29,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -68,4 +71,9 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper<BusSalesOrderBor
     void updateBusNo(@Param("busNo") String busNo,@Param("saleOrderBorrowerSid") String saleOrderBorrowerSid);
 
     int selectBySalesOrderSid(String sid);
+
+    LoanFinPolicy selectBySid(String sid);
+
+	BusSalesOrderBorrower selectByOrderSid(@Param("sid") String sid,@Param("customerSid") String customerSid);
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.xml

@@ -14,4 +14,14 @@
 	<select id="selectBySalesOrderSid" resultType="int">
 		select ifnull(sum(vehCount),0) from bus_sales_order_borrower where salesOrderSid = #{sid}
     </select>
+
+	<select id="selectBySid" resultType="com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy">
+		select lp.* from anrui_riskcenter.loan_solutions ls
+		left join anrui_riskcenter.loan_fin_policy lp on lp.sid = ls.policySid
+		where ls.salesOrderSid = #{sid}
+    </select>
+
+	<select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower">
+		select * from bus_sales_order_borrower where salesOrderSid = #{sid} and customSid = #{customerSid}
+	</select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java

@@ -30,7 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.*;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
+import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -41,6 +46,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -61,6 +67,8 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
 
     @Autowired
     private BusSalesOrderPriceService busSalesOrderPriceService;
+    @Autowired
+    private BusSalesOrderVehicleService busSalesOrderVehicleService;
 
 
     private QueryWrapper<BusSalesOrderBorrower> createQueryWrapper(BusSalesOrderBorrowerQuery query) {
@@ -134,7 +142,37 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService<BusSalesOrd
 
     public ResultBean confirmBorrow(OrderBorrowQuery query) {
         ResultBean rb = ResultBean.fireFail();
-
-        return null;
+        //销售订单sid
+        String sid = query.getSid();
+        String customerSid = query.getCustomSid();
+        BusSalesOrderBorrower busSalesOrderBorrower = baseMapper.selectByOrderSid(sid, customerSid);
+        if (busSalesOrderBorrower != null) {
+            return rb.setMsg("该销售订单中已存在该贷款人");
+        }
+        busSalesOrderBorrower = new BusSalesOrderBorrower();
+        busSalesOrderBorrower.setSalesOrderSid(sid);
+        busSalesOrderBorrower.setBorrowerName(query.getBorrowerName());
+        busSalesOrderBorrower.setCustomSid(query.getCustomSid());
+        busSalesOrderBorrower.setMobile(query.getMobile());
+        busSalesOrderBorrower.setVehCount(query.getVehCount());
+        LoanFinPolicy loanFinPolicy = baseMapper.selectBySid(sid);
+        if (loanFinPolicy != null) {
+            busSalesOrderBorrower.setBankSid(loanFinPolicy.getBankSid());
+            busSalesOrderBorrower.setBankName(loanFinPolicy.getBankShortName());
+            busSalesOrderBorrower.setPolicyName(loanFinPolicy.getPolicyName());
+        }
+        //更新销售订单车辆里的贷款人
+        List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(sid);
+        list.removeAll(Collections.singleton(null));
+        if (list.size() < query.getVehCount()) {
+            return rb.setMsg("销售订单剩余台数不足");
+        }
+        for (int i = 0; i < query.getVehCount(); i++) {
+            BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
+            busSalesOrderVehicle.setBorrowerSid(query.getCustomSid());
+            busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+        }
+        baseMapper.insert(busSalesOrderBorrower);
+        return rb.success();
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java

@@ -30,6 +30,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -96,4 +97,6 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
     BusSalesOrderPrice selectByContractNoOne(String contractNo);
 
     List<BusSalesOrderPrice> selectListByOrderSid(@Param("saleOrderSid")String saleOrderSid);
+
+    List<BusSalesOrderVehicle> selectByOrdersSid(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -73,4 +73,8 @@
         from bus_sales_order_price
         where salesOrderSid = #{saleOrderSid}
     </select>
+
+    <select id="selectByOrdersSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where salesOrderSid = #{sid} and (borrowerSid is null or borrowerSid = '')
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -35,6 +35,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsV
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
 import com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelService;
@@ -213,4 +214,8 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     public List<BusSalesOrderPrice> selectListByOrderSid(String saleOrderSid) {
         return baseMapper.selectListByOrderSid(saleOrderSid);
     }
+
+    public List<BusSalesOrderVehicle> selectByOrdersSid(String sid) {
+        return baseMapper.selectByOrdersSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -108,6 +108,7 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     int updateTemporaryNo(@Param("sid") String sid, @Param("temporaryNo") String temporaryNo, @Param("temporaryName") String temporaryName);
 
     List<BusSalesOrderVehicle> selectByOrderSid(@Param("salesOrderSid") String salesOrderSid);
+    List<BusSalesOrderVehicle> selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid);
 
     @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}")
     BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid);
@@ -149,4 +150,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
     void updateXDCon(@Param("sid") String sid, @Param("borrowerSid") String borrowerSid, @Param("loanContractSid") String loanContractSid);
 
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
+
+    List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -80,6 +80,12 @@
         where salesOrderSid = #{salesOrderSid}
     </select>
 
+    <select id="selectByOrderSid2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select *
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{salesOrderSid} and borrowerSid = #{borrowSid}
+    </select>
+
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select bv.*
         from bus_sales_order_vehicle bv
@@ -235,4 +241,9 @@
                  LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid
         WHERE bv.sid = #{sid}
     </select>
+
+    <select id="selectListByOrdersSid"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select * from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -294,6 +294,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByOrderSid(saleOrderSid);
     }
 
+    public List<BusSalesOrderVehicle> selectListByOrderSid2(String saleOrderSid,String borrowSid) {
+        return baseMapper.selectByOrderSid2(saleOrderSid,borrowSid);
+    }
+
     public ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList2(BusVehicleQKKPQuery query) {
         ResultBean rb = ResultBean.fireFail();
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
@@ -571,4 +575,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     public BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid) {
         return baseMapper.selectVinNoBySid(sid);
     }
+
+    public List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid) {
+        return baseMapper.selectListByOrdersSid(saleOrderSid);
+    }
 }

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue

@@ -535,6 +535,10 @@ export default {
         this.finance.nominalPrice = choose[0].nominalPrice
         // 从金融产品政策中-- 获取代收意外险
         this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
+        // 从金融产品政策中-- 获取服务费类型
+        this.finance.serviceChargeTypeKey = choose[0].serviceChargeTypeKey
+        // 从金融产品政策中-- 获取服务费
+        this.finance.serviceChargeTypeValue = choose[0].serviceChargeTypeValue
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
@@ -623,11 +627,11 @@ export default {
           // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
           this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
         } else if (this.finance.serviceChargeTypeKey === '02') {
-          // 等于金融产品政策中服务费
-          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
-        } else if (this.finance.serviceChargeTypeKey === '03') {
           // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
           this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        } else if (this.finance.serviceChargeTypeKey === '03') {
+          // 等于金融产品政策中服务费
+          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
         }
       }
       if (this.finance.premiumCb && this.finance.dealWayKey === '02') {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -535,6 +535,10 @@ export default {
         this.finance.nominalPrice = choose[0].nominalPrice
         // 从金融产品政策中-- 获取代收意外险
         this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
+        // 从金融产品政策中-- 获取服务费类型
+        this.finance.serviceChargeTypeKey = choose[0].serviceChargeTypeKey
+        // 从金融产品政策中-- 获取服务费
+        this.finance.serviceChargeTypeValue = choose[0].serviceChargeTypeValue
         // 当融资项目总额不为空且不为0时，如果更换产品政策（需要重新计算首付金额、产品贷款金额、贷款保证金等，重置其它融模块的内容）
         if (this.finance.loanTotal !== '' && this.finance.loanTotal !== '0') {
           // 重新计算
@@ -620,11 +624,11 @@ export default {
           // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
           this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
         } else if (this.finance.serviceChargeTypeKey === '02') {
-          // 等于金融产品政策中服务费
-          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
-        } else if (this.finance.serviceChargeTypeKey === '03') {
           // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
           this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        } else if (this.finance.serviceChargeTypeKey === '03') {
+          // 等于金融产品政策中服务费
+          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
         }
       }
       if (this.finance.premiumCb && this.finance.dealWayKey === '02') {

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/LoanFinPolicyStateQuery.java

@@ -17,4 +17,6 @@ public class LoanFinPolicyStateQuery {
     private List<String> sidsList = new ArrayList<>();
     @ApiModelProperty("useState为1时走停用，为0时走开启")
     private String useState;
+    @ApiModelProperty("操作人用户sid")
+    private String userSid;
 }

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

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

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

@@ -24,4 +24,6 @@ public class LoanPreloanQuery implements Query {
 
     @ApiModelProperty("移动端：姓名、身份证、手机号")
     private String name;
+    @ApiModelProperty("销售订单sid")
+    private String orderSid;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyService.java

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -119,7 +120,11 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 BeanUtil.copyProperties(loanFinOtherPolicyDto, loanFinOtherPolicy);
                 //其它融名称=资方+产品类别+最高融资比例+期数
                 //其它融产品名称=资方简称+产品类别+期数+最高融资比例，如:中车首付贷 24 期20
-                String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 " + loanFinOtherPolicy.getMaxLoanRatio();
+                String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 ";
+                if(StringUtils.isNotBlank(loanFinOtherPolicyDto.getMaxLoanRatio())){
+                    name = name+loanFinOtherPolicy.getMaxLoanRatio()+"%";
+                }
+
                 loanFinOtherPolicy.setOtherPolicyName(name);
                 loanFinOtherPolicy.setMainPolicySid(loanFinPolicy.getSid());
                 loanFinOtherPolicy.setUseDeptSids(deptSids);
@@ -165,8 +170,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                     BeanUtil.copyProperties(loanFinOtherPolicyDto, loanFinOtherPolicy);
                     loanFinOtherPolicy.setUseDeptSids(deptSids);
                     loanFinOtherPolicy.setUseDeptNames(deptNames);
-                    //其它融名称=资方+产品类别+最高融资比例+期数
-                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue() + " " + loanFinOtherPolicy.getPeriod()+ "期 " + loanFinOtherPolicy.getMaxLoanRatio() ;
+                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 ";
+                    if(StringUtils.isNotBlank(loanFinOtherPolicyDto.getMaxLoanRatio())){
+                        name = name+loanFinOtherPolicy.getMaxLoanRatio()+"%";
+                    }
                     loanFinOtherPolicy.setOtherPolicyName(name);
                     loanFinOtherPolicyService.updateById(loanFinOtherPolicy);
                 } else {
@@ -181,8 +188,10 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                     loanFinOtherPolicy.setUseOrgName(useOrgName);
                     loanFinOtherPolicy.setCreateOrgName(useOrgName);
                     loanFinOtherPolicy.setCreateBySid(dto.getUserSid());
-                    //其它融名称=资方+产品类别+最高融资比例+期数
-                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue() + " " + loanFinOtherPolicy.getPeriod()+ "期 " + loanFinOtherPolicy.getMaxLoanRatio() ;
+                    String name = loanFinOtherPolicy.getBankShortName() + " " + loanFinOtherPolicy.getProductTypeValue()  + " " + loanFinOtherPolicy.getPeriod()+ "期 ";
+                    if(StringUtils.isNotBlank(loanFinOtherPolicyDto.getMaxLoanRatio())){
+                        name = name+loanFinOtherPolicy.getMaxLoanRatio()+"%";
+                    }
                     loanFinOtherPolicy.setOtherPolicyName(name);
                     loanFinOtherPolicyService.insert(loanFinOtherPolicy);
                 }
@@ -278,6 +287,8 @@ public class LoanFinPolicyService extends MybatisBaseService<LoanFinPolicyMapper
                 return rb.setMsg("选择中包含金融产品政策不存在的数据，请刷新后操作");
             }
             loanFinPolicy.setUseSate(Integer.valueOf(useState).intValue());
+            loanFinPolicy.setModifyTime(new Date());
+            loanFinPolicy.setUpdateBySid(query.getUserSid());
             baseMapper.updateById(loanFinPolicy);
             LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(sid);
             if (loanFinOtherPolicy != null) {

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

@@ -65,4 +65,6 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     LoanPreloanCreditApply judgeIsLoan(String sid);
 
     LoanOrderPreloanVo judgeIsLoan2(String sid);
+
+    List<String> selectBySid(String orderSid);
 }

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

@@ -48,7 +48,7 @@
         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} and la.state = 0
+        where bo.sid = #{sid}
         order by la.createTime desc limit 1
     </select>
 
@@ -58,4 +58,8 @@
         left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
         where bo.sid = #{sid}
     </select>
+
+    <select id="selectBySid" resultType="java.lang.String">
+        select borrowerSid from anrui_buscenter.bus_sales_order_vehicle where salesOrderSid = #{orderSid}
+    </select>
 </mapper>

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

@@ -54,6 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -562,6 +563,12 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                 qw.like("la.idCard", query.getIdCard());
             }
             qw.eq("la.isDelete", 0);
+            //排除销售订单已选择的贷款人
+            List<String> borrowSidList = baseMapper.selectBySid(query.getOrderSid());
+            borrowSidList.removeAll(Collections.singleton(null));
+            if(borrowSidList.size()>0){
+                qw.notIn("la.custSid",borrowSidList);
+            }
         }
         IPage<LoanPreloanCreditApply> page = PagerUtil.queryToPage(pagerQuery);
         IPage<LoanPreloanVo> pagging = baseMapper.getOrderLoanPagerList(page, qw, query.getName());
@@ -578,8 +585,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             loanOrderPreloanVo.setConfirmBtn("信用审核");
             return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
         } else {
-            if (StringUtils.isNotBlank(loanPreloanCreditApply.getGsfkjgKey())) {
-                if (loanPreloanCreditApply.getState() != 2 && "001".equals(loanPreloanCreditApply.getGsfkjgKey())) {
+            if ("1".equals(loanPreloanCreditApply.getState())) {
+                loanOrderPreloanVo.setConfirmBtn("信用审核");
+                return rb.setData(loanOrderPreloanVo).setMsg("实际购车人未进行贷前信用审核");
+            } else if ("0".equals(loanPreloanCreditApply.getState())) {
                 loanOrderPreloanVo.setConfirmBtn("我知道了");
                 return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
             } else {
@@ -601,10 +610,6 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
                     return rb.success();
                 }
             }
-            } else {
-                loanOrderPreloanVo.setConfirmBtn("我知道了");
-                return rb.setData(loanOrderPreloanVo).setMsg("实际购车人的贷前信用审核进行中，请等待！");
-            }
         }
     }
 }

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

@@ -691,7 +691,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (dto.isShowMore()) {
             String mainVehicleAmount = dto.getMainVehicleAmount();
             if (StringUtils.isBlank(mainVehicleAmount)) {
-                return rb.setMsg("主车发票价不能为空");
+//                return rb.setMsg("主车发票价不能为空");
+                return rb.setMsg("请检查金融方案计算是否已点击确定");
             }
             //是否勾选融资票据
             if (dto.isAccessoriesAmountCb()) {
@@ -834,7 +835,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             String loanInterest = dto.getLoanInterest();
             loanSolutions.setLoanInterest(StringUtils.isNotBlank(loanInterest) ? new BigDecimal(loanInterest) : BigDecimal.ZERO);
             LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy();
-            if (dto.isOtherPolicyState()) {//包含其他融
+            if (dto.isOtherPolicyState()) {//包含其它融
                 BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
                 //贷款金额
                 String otherPolicyAmount = dto.getOtherPolicyAmount();
@@ -857,29 +858,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
                         if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
                             if (maxLoanAmount.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         } else {
                             if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
                                 if (maxLoanAmount.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             } else {//maxLoanAmountRat与贷款金额作对比
                                 if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             }
                         }
                     } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
                         if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
 
                     } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
                         //根据最高融资比例计算最高融资额
                         BigDecimal maxLoanAmountRat = new BigDecimal(dto.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
                         if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
                     }
                 }
@@ -976,7 +977,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetailService.insert(loanSolutionsDetail);
         } else {
             if (StringUtils.isBlank(dto.getFactoryDiscount())) {
-                return rb.setMsg("厂家贴息不能为空");
+                return rb.setMsg("请检查金融方案计算是否已点击确定");
+//                return rb.setMsg("厂家贴息不能为空");
             }
             if (StringUtils.isBlank(dto.getDiscountCar())) {
                 return rb.setMsg("贴息抵车款不能为空");
@@ -1211,7 +1213,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         BigDecimal loanDownPay = BigDecimal.ZERO;//方案汇总融资首付
         BigDecimal downPayAmountsRatio = BigDecimal.ZERO;//实际首付比例
         BigDecimal loanAmountTotal = BigDecimal.ZERO;//总贷款金额
-        //其他融期数
+        //其它融期数
         String otherPolicyPeriod = query.getOtherPolicyPeriod();
         BigDecimal loanPayMoneyAll = BigDecimal.ZERO;
         BigDecimal vehTotalPrice = BigDecimal.ZERO;
@@ -1291,7 +1293,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (StringUtils.isNotBlank(downPayAmount)) {
             //贷款金额 = 融资项目总额-首付金额。
             loanAmount = loanTotal.subtract(new BigDecimal(downPayAmount));
-            //方案汇总融资首付 = 融资首付+首付金额-其他融贷款金额
+            //方案汇总融资首付 = 融资首付+首付金额-其它融贷款金额
             loanDownPay = loanDownPay.add(new BigDecimal(downPayAmount));
             loanAmountTotal = loanAmountTotal.add(loanAmount);
         }
@@ -1341,12 +1343,12 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             calculateVo.setPolicyYearRatio(policyYearRatio.toString());
             calculateVo.setLoanPayMoney(loanPayMoney.toString());
         }
-        //是否包含其他融
+        //是否包含其它融
         boolean otherPolicyState = query.isOtherPolicyState();
         if (otherPolicyState) {//包含
             otherPolicyPeriod = query.getOtherPolicyPeriod();
             if (StringUtils.isBlank(otherPolicyPeriod)) {
-                return rb.setMsg("请选择其他融");
+                return rb.setMsg("请选择其它融");
             }
             String otherPolicyYearRatio = query.getOtherPolicyYearRatio();
             if (otherPolicyYearRatio.contains("%")) {
@@ -1354,7 +1356,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             String otherPolicyAmount = query.getOtherPolicyAmount();
             if (StringUtils.isBlank(otherPolicyAmount)) {
-                return rb.setMsg("其他融贷款金额不能为空");
+                return rb.setMsg("其它融贷款金额不能为空");
             }
 
             if (StringUtils.isBlank(otherPolicyPeriod)) {
@@ -1394,29 +1396,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
                     if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
                         if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
                     } else {
                         if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
                             if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         } else {//maxLoanAmountRat与贷款金额作对比
                             if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         }
                     }
                 } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
                     if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                        return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        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("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                     }
                 }
             }
@@ -2355,29 +2357,29 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
                         if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
                             if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                             }
                         } else {
                             if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
                                 if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             } else {//maxLoanAmountRat与贷款金额作对比
                                 if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                    return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                                 }
                             }
                         }
                     } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
                         if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
-                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            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("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            return rb.setMsg("其它融贷款金额不能高于最高比例或最高贷款金额");
                         }
                     }
                 }

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

@@ -42,10 +42,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -293,6 +290,11 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean<VinNoVo> getVinList(@PathVariable("saleOrderSid") String saleOrderSid);
 
+    @ApiOperation("初始化|录入车架号列表")
+    @GetMapping("/init/saleOrderInputVin2/{saleOrderSid}")
+    @ResponseBody
+    ResultBean<VinNoVo2> getVinList2(@PathVariable("saleOrderSid") String saleOrderSid);
+
     @ApiOperation("补录车架号，选择列表")
     @PostMapping("/init/saleOrderVin")
     @ResponseBody

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

@@ -42,10 +42,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -259,6 +256,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<VinNoVo2> getVinList2(String saleOrderSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
         return null;

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class BusVinNoVo2 {
+    @ApiModelProperty("贷款人")
+    private String borrowName;
+    private String borrowSid;
+    private List<BusVinNoVo> vinList;
+}

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/8
+ **/
+@Data
+public class VinNoVo2 {
+
+    private String saleOrderSid;
+
+    private List<BusVinNoVo2> vinList;
+
+}

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

@@ -44,10 +44,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -351,6 +348,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getVinList(saleOrderSid);
     }
 
+    @Override
+    public ResultBean<VinNoVo2> getVinList2(String saleOrderSid) {
+        return appBusSalesOrderService.getVinList2(saleOrderSid);
+    }
+
     @Override
     public ResultBean<PagerVo<InputVinVo>> saleOrderVin(PagerQuery<InputVinQuery> query) {
         return appBusSalesOrderService.saleOrderVin(query);

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

@@ -46,6 +46,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppInitModelQuery;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinVo2;
 import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto;
@@ -95,10 +96,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopDto;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.topinfo.TopVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinDto;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.InputVinVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.VinNoVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.vininput.*;
 import com.yxt.anrui.terminal.api.base.common.CarModelVo;
 import com.yxt.anrui.terminal.api.base.common.SystemVo;
 import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo;
@@ -740,4 +738,13 @@ public class AppBusSalesOrderService {
         }
         return rb.success();
     }
+
+    public ResultBean<VinNoVo2> getVinList2(String saleOrderSid) {
+        ResultBean<VinNoVo2> rb = ResultBean.fireFail();
+        VinNoVo2 vinNoVo = new VinNoVo2();
+        ResultBean<VinVo2> resultBean = busSalesOrderFeign.saleOrderInputVin2(saleOrderSid);
+        VinVo2 vinVo = resultBean.getData();
+        BeanUtil.copyProperties(vinVo, vinNoVo);
+        return rb.success().setData(vinNoVo);
+    }
 }