销售订单确定贷款人

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

@@ -362,10 +362,10 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid);
 
-    @ApiOperation("删除销售订单贷款人")
-    @PostMapping("/saveBorrowNum/{sid}/{num}")
+    @ApiOperation("保存贷款人数量")
+    @PostMapping("/saveBorrowNum")
     @ResponseBody
-    ResultBean saveBorrowNum(@PathVariable("sid") String sid, @PathVariable("num") String num);
+    ResultBean saveBorrowNum(@RequestParam("sid") String sid, @RequestParam("vins") List<String> vins);
 
     @ApiOperation("保存销售订单贷款人自己")
     @PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}")

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

@@ -338,7 +338,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean saveBorrowNum(String sid, String num) {
+    public ResultBean saveBorrowNum(String sid, List<String> vins) {
         return null;
     }
 

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

@@ -14,4 +14,6 @@ public class VinListDto implements Dto {
 
     private String linkNo;
     private String linkSid;
+
+    private String pos;
 }

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

@@ -22,6 +22,6 @@ public class VinListVo2 {
     private int viewType;
     @ApiModelProperty("当上面字段为0时，该值为空字符串，为1时，贷款人：xxx，/未选择贷款人")
     private String groupName;
-
+    @ApiModelProperty("车架号几")
     private String pos;
 }

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/26
+ **/
+@Data
+public class BusBorrowVehicleVo implements Vo {
+    private static final long serialVersionUID = 5052266911086255031L;
+
+    private String sid;
+
+    private String borrowName;
+
+    private String borrowerSid;
+
+    private String linkNo;
+
+    private String linkSid;
+    private String temporaryNo;
+}

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

@@ -130,4 +130,10 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/selectByOrderSidAndVehSid")
     @ResponseBody
     ResultBean<BusSalesOrderVehicle> selectByOrderSidAndVehSid(@RequestParam("sid") String sid, @RequestParam("vehSid") String vehSid);
+
+    @ApiOperation("贷款人选择车辆")
+    @GetMapping("/saleOrderInputLenderVins/{sale0rderSid}")
+    @ResponseBody
+    ResultBean<List<BusVehicleBorrowVo>> saleOrderInputLenderVins(@PathVariable("sale0rderSid") String sale0rderSid);
+
 }

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

@@ -123,4 +123,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe
         return null;
     }
 
+    @Override
+    public ResultBean<List<BusVehicleBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
+        return null;
+    }
+
 }

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.buscenter.api.bussalesordervehicle;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/26
+ **/
+@Data
+public class BusVehicleBorrowVo implements Vo {
+    private static final long serialVersionUID = -8426391599241222618L;
+
+    private String dictKey;
+
+    private String dictValue;
+}

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

@@ -421,8 +421,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean saveBorrowNum(String sid, String num) {
-        return busSalesOrderService.saveBorrowNum(sid,num);
+    public ResultBean saveBorrowNum(String sid,List<String> vins) {
+        return busSalesOrderService.saveBorrowNum(sid,vins);
     }
 
     @Override

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

@@ -102,6 +102,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
@@ -5910,18 +5911,34 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
             baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             for (int i = 0; i < busSalesOrderVehicleDetailsVos.size(); i++) {
-                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderVehicleDetailsVos.get(i).getSid());
-                busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
-                busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
-                busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
-                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
-                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SAVEVIN.getTypeKey());
-                if (StringUtils.isNotBlank(list.get(i).getLinkSid())) {
-                    baseVehicleStateDto.setVinSid(list.get(i).getLinkSid());
-                    baseVehicleStateDto.setVinNo(list.get(i).getLinkNo());
+                if(StringUtils.isBlank(list.get(i).getPos())){
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderVehicleDetailsVos.get(i).getSid());
+                    busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
+                    busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
+                    busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SAVEVIN.getTypeKey());
+                    if (StringUtils.isNotBlank(list.get(i).getLinkSid())) {
+                        baseVehicleStateDto.setVinSid(list.get(i).getLinkSid());
+                        baseVehicleStateDto.setVinNo(list.get(i).getLinkNo());
+                    }
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    dtoList.add(baseVehicleStateDto);
+                }else{
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectBySidAndOrderBo(dto.getSaleOrderSid(),list.get(i).getPos());
+                    busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
+                    busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
+                    busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.DDBA_SAVEVIN.getTypeKey());
+                    if (StringUtils.isNotBlank(list.get(i).getLinkSid())) {
+                        baseVehicleStateDto.setVinSid(list.get(i).getLinkSid());
+                        baseVehicleStateDto.setVinNo(list.get(i).getLinkNo());
+                    }
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    dtoList.add(baseVehicleStateDto);
                 }
-                baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
-                dtoList.add(baseVehicleStateDto);
+
             }
             //将选择的车辆的锁定状态修改为已锁定
             busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@@ -7297,67 +7314,75 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         VinVo2 vinVo = new VinVo2();
-        List<BusSalesOrderVehicle> busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid);
+        List<BusBorrowVehicleVo> 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<>();
-        int pos = 0;
-        for (int j = 0; j < borrowSidList.size(); j++) {
-            VinListVo2 vinListVo2 = new VinListVo2();
-            String borrowSid = borrowSidList.get(j);
-            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
-            if (type == 1) {
-                vinListVo2.setViewType(0);
-                pos = pos + 1;
-                vinListVo2.setPos(String.valueOf(pos));
-            } else if (type == 2) {
-                vinListVo2.setViewType(1);
-                String borrowName = busSalesOrderVehicle.getBorrowName();
+//        int pos = 0;
+        String pos = "";
+        if(borrowSidList.size()>0){
+            for (int j = 0; j < borrowSidList.size(); j++) {
+                VinListVo2 vinListVo2 = new VinListVo2();
+                String borrowSid = borrowSidList.get(j);
+                BusBorrowVehicleVo busSalesOrderVehicle = busSalesOrderVehicleList.get(j);
+                if (type == 1) {
+                    vinListVo2.setViewType(0);
+//                    pos = pos + 1;
+                    pos = busSalesOrderVehicle.getTemporaryNo();
+                    vinListVo2.setPos(String.valueOf(pos));
+                } else if (type == 2) {
+                    vinListVo2.setViewType(1);
+                    String borrowName = busSalesOrderVehicle.getBorrowName();
+                    if (StringUtils.isNotBlank(borrowSid)) {
+                        vinListVo2.setGroupName("贷款人:" + borrowName);
+                    } else {
+                        vinListVo2.setGroupName("贷款人:不确定贷款人");
+                    }
+                }
+                vinList.add(vinListVo2);
+                List<BusBorrowVehicleVo> busSalesOrderVehicleLists = new ArrayList<>();
                 if (StringUtils.isNotBlank(borrowSid)) {
-                    vinListVo2.setGroupName("贷款人:" + borrowName);
+                    busSalesOrderVehicleLists = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
                 } else {
-                    vinListVo2.setGroupName("贷款人:不确定贷款人");
+                    busSalesOrderVehicleLists = busSalesOrderVehicleService.selectListByOrderSid3(saleOrderSid);
                 }
-            }
-            vinList.add(vinListVo2);
-            if (StringUtils.isNotBlank(borrowSid)) {
-                busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid2(saleOrderSid, borrowSid);
-            } else {
-                busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrderSid3(saleOrderSid);
-            }
 
-            busSalesOrderVehicleList.removeAll(Collections.singleton(null));
-            if (!busSalesOrderVehicleList.isEmpty()) {
-                for (int i = 0; i < busSalesOrderVehicleList.size(); i++) {
-                    vinListVo2 = new VinListVo2();
-                    vinListVo2.setViewType(0);
-                    pos = pos + 1;
-                    vinListVo2.setPos(String.valueOf(pos));
-                    busSalesOrderVehicle = busSalesOrderVehicleList.get(i);
-                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
-                        vinListVo2.setLinkNo(busSalesOrderVehicle.getLinkNo());
-                    }
-                    if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
-                        vinListVo2.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())) {
-                                    vinListVo2.setState(true);
-                                } else {
-                                    vinListVo2.setState(false);
+                busSalesOrderVehicleLists.removeAll(Collections.singleton(null));
+                if (!busSalesOrderVehicleLists.isEmpty()) {
+                    for (int i = 0; i < busSalesOrderVehicleLists.size(); i++) {
+                        vinListVo2 = new VinListVo2();
+                        vinListVo2.setViewType(0);
+                        busSalesOrderVehicle = busSalesOrderVehicleLists.get(i);
+                        pos = busSalesOrderVehicle.getTemporaryNo();
+//                        pos = pos + 1;
+                        vinListVo2.setPos(pos);
+
+                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+                            vinListVo2.setLinkNo(busSalesOrderVehicle.getLinkNo());
+                        }
+                        if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkSid())) {
+                            vinListVo2.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())) {
+                                        vinListVo2.setState(true);
+                                    } else {
+                                        vinListVo2.setState(false);
+                                    }
                                 }
                             }
                         }
+                        vinList.add(vinListVo2);
                     }
-                    vinList.add(vinListVo2);
                 }
             }
         }
+
         vinVo.setSaleOrderSid(saleOrderSid);
         vinVo.setVinList(vinList);
         return rb.success().setData(vinVo);
@@ -7430,7 +7455,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
-    public ResultBean saveBorrowNum(String sid, String num) {
+    public ResultBean saveBorrowNum(String sid, List<String> vins) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid);
         if (busSalesOrderBorrower == null) {
@@ -7446,13 +7471,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 return rb.setMsg("销售订单的剩余台数已不足");
             }
         }
-        busSalesOrderBorrower.setVehCount(Integer.parseInt(num));
+        busSalesOrderBorrower.setVehCount(vins.size());
         List<BusSalesOrderVehicle> list = busSalesOrderPriceService.selectByOrdersSid(busSalesOrderBorrower.getSalesOrderSid());
         list.removeAll(Collections.singleton(null));
         if (list.size() > 0) {
-            for (int i = 0; i < Integer.parseInt(num); i++) {
-                BusSalesOrderVehicle busSalesOrderVehicle = list.get(i);
+            for (int i = 0; i < vins.size(); i++) {
+                String busVinSid = vins.get(i);
+                BusSalesOrderVehicle busSalesOrderVehicle =busSalesOrderVehicleService.fetchBySid(busVinSid);
                 busSalesOrderVehicle.setBorrowerSid(busSalesOrderBorrower.getSid());
+                busSalesOrderVehicle.setBorrowName(busSalesOrderBorrower.getBorrowerName());
                 busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
             }
             //更新业务状态码

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

@@ -32,10 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleQKKPVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.QCarVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -108,8 +105,8 @@ 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);
-    List<BusSalesOrderVehicle> selectByOrderSid3(@Param("salesOrderSid") String salesOrderSid);
+    List<BusBorrowVehicleVo> selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid);
+    List<BusBorrowVehicleVo> selectByOrderSid3(@Param("salesOrderSid") String salesOrderSid);
 
     @Select("select * from bus_sales_order_vehicle where sid = #{busVinSid}")
     BusSalesOrderVehicle selectBySalesOrderVehiclerSid(String busVinSid);
@@ -152,10 +149,14 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehi
 
     BusSalesOrderVehicleDetailsVo selectVinNoBySid(String sid);
 
-    List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid);
+    List<BusBorrowVehicleVo> selectListByOrdersSid(String saleOrderSid);
 
     BusSalesOrderVehicle selectByBorrowSid(String sid);
 
     @Select("select * from bus_sales_order_vehicle where linkSid = #{vehSid} and salesOrderSid = #{sid}")
     BusSalesOrderVehicle selectByOrderSidAndVehSid(@Param("sid") String sid,@Param("vehSid") String vehSid);
+
+    List<BusVehicleBorrowVo> saleOrderInputLenderVins(String sale0rderSid);
+
+    BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos);
 }

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

@@ -80,16 +80,18 @@
         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 id="selectByOrderSid2" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
+        select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,bv.linkSid,bv.linkNo
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        where bv.salesOrderSid = #{salesOrderSid} and bv.borrowerSid = #{borrowSid}
     </select>
 
-    <select id="selectByOrderSid3" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
-        select *
-        from bus_sales_order_vehicle
-        where salesOrderSid = #{salesOrderSid} and (borrowerSid IS NULL OR borrowerSid = '')
+    <select id="selectByOrderSid3" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
+        select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,bv.linkSid,bv.linkNo
+        from bus_sales_order_vehicle bv
+        left join bus_sales_order bso on bso.sid = bv.salesOrderSid
+        where bv.salesOrderSid = #{salesOrderSid} and (bv.borrowerSid IS NULL OR bv.borrowerSid = '')
     </select>
 
     <select id="selectByNoAndVinSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
@@ -249,11 +251,26 @@
     </select>
 
     <select id="selectListByOrdersSid"
-            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
-        select * from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo">
+        select sid,ifnull(borrowerSid,'') as borrowerSid,borrowName,linkNo,linkSid from bus_sales_order_vehicle where salesOrderSid = #{saleOrderSid} group by borrowerSid
     </select>
 
     <select id="selectByBorrowSid" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select * from bus_sales_order_vehicle where borrowerSid = #{sid}
     </select>
+
+    <select id="saleOrderInputLenderVins"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo">
+        select if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) as temporaryNo,concat(if(bso.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)),':',if(bv.linkNo is null or LENGTH(trim(bv.linkNo)) &lt; 1,'-',RIGHT(bv.linkNo, 8))) as dictValue,bv.sid dictKey
+                   from bus_sales_order_vehicle bv
+                                                                   LEFT JOIN bus_sales_order AS bso ON bv.salesOrderSid = bso.sid
+        where (bv.borrowerSid is null or bv.borrowerSid = '') and bv.salesOrderSid = #{sale0rderSid}
+        order by temporaryNo asc
+    </select>
+
+    <select id="selectBySidAndOrderBo"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
+        select bv.* from bus_sales_order_vehicle bv left join bus_sales_order bo on bo.sid = bv.salesOrderSid
+        where if(bo.payTypeKey = 1,bv.temporaryNo,RIGHT(bv.temporaryNo, 2)) = #{pos} and bv.salesOrderSid = #{saleOrderSid}
+    </select>
 </mapper>

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

@@ -138,5 +138,10 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
         return busSalesOrderVehicleService.selectByOrderSidAndVehSid(sid, vehSid);
     }
 
+    @Override
+    public ResultBean<List<BusVehicleBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
+        return busSalesOrderVehicleService.saleOrderInputLenderVins(sale0rderSid);
+    }
+
 
 }

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

@@ -294,11 +294,11 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectByOrderSid(saleOrderSid);
     }
 
-    public List<BusSalesOrderVehicle> selectListByOrderSid2(String saleOrderSid, String borrowSid) {
+    public List<BusBorrowVehicleVo> selectListByOrderSid2(String saleOrderSid, String borrowSid) {
         return baseMapper.selectByOrderSid2(saleOrderSid, borrowSid);
     }
 
-    public List<BusSalesOrderVehicle> selectListByOrderSid3(String saleOrderSid) {
+    public List<BusBorrowVehicleVo> selectListByOrderSid3(String saleOrderSid) {
         return baseMapper.selectByOrderSid3(saleOrderSid);
     }
 
@@ -582,7 +582,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.selectVinNoBySid(sid);
     }
 
-    public List<BusSalesOrderVehicle> selectListByOrdersSid(String saleOrderSid) {
+    public List<BusBorrowVehicleVo> selectListByOrdersSid(String saleOrderSid) {
         return baseMapper.selectListByOrdersSid(saleOrderSid);
     }
 
@@ -595,4 +595,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByOrderSidAndVehSid(sid, vehSid);
         return rb.success().setData(busSalesOrderVehicle);
     }
+
+    public ResultBean<List<BusVehicleBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
+        ResultBean<List<BusVehicleBorrowVo>> rb = ResultBean.fireFail();
+        List<BusVehicleBorrowVo> list = baseMapper.saleOrderInputLenderVins(sale0rderSid);
+        return rb.success().setData(list);
+    }
+
+    public BusSalesOrderVehicle selectBySidAndOrderBo(String saleOrderSid, String pos) {
+        return baseMapper.selectBySidAndOrderBo(saleOrderSid,pos);
+    }
 }

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

@@ -341,9 +341,9 @@ public interface AppBusSalesOrderFeign {
     ResultBean deleteSaleOrderInputLender(@PathVariable("sid") String sid);
 
     @ApiOperation("保存销售订单贷款人数量")
-    @PostMapping("/save/saleOrderInputLenderNum/{sid}/{num}")
+    @PostMapping("/save/saleOrderInputLenderNum")
     @ResponseBody
-    ResultBean saleOrderInputLenderNum(@PathVariable("sid") String sid, @PathVariable("num") String num);
+    ResultBean saleOrderInputLenderNum(@RequestParam("sid") String sid, @RequestParam("vins") List<String> vins);
 
     @ApiOperation("保存销售订单贷款人自己")
     @PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}")
@@ -359,4 +359,11 @@ public interface AppBusSalesOrderFeign {
     @PostMapping("/getPreLoanList")
     @ResponseBody
     ResultBean<PagerVo<LoanPreloansVo>> getPreLoanList(@RequestBody PagerQuery<LoanPreloansQuery> pagerQuery);
+
+    @ApiOperation("贷款人选择车辆列表")
+    @GetMapping("/init/saleOrderInputLenderVins/{sale0rderSid}")
+    @ResponseBody
+    ResultBean<List<SalerBorrowVo>> saleOrderInputLenderVins(@PathVariable("sale0rderSid") String sale0rderSid);
+
+
 }

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

@@ -307,7 +307,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean saleOrderInputLenderNum(String sid, String num) {
+    public ResultBean saleOrderInputLenderNum(String sid, List<String> vins) {
         return null;
     }
 
@@ -325,4 +325,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     public ResultBean<PagerVo<LoanPreloansVo>> getPreLoanList(PagerQuery<LoanPreloansQuery> pagerQuery) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SalerBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
+        return null;
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2023/9/26
+ **/
+@Data
+public class SalerBorrowVo implements Vo {
+    private static final long serialVersionUID = -2747288934418692007L;
+
+    private String dictKey;
+
+    private String dictValue;
+}

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

@@ -400,8 +400,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean saleOrderInputLenderNum(String sid, String num) {
-        return appBusSalesOrderService.saleOrderInputLenderNum(sid,num);
+    public ResultBean saleOrderInputLenderNum(String sid, List<String> vins) {
+        return appBusSalesOrderService.saleOrderInputLenderNum(sid,vins);
     }
 
     @Override
@@ -419,4 +419,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.getPreLoanList(pagerQuery);
     }
 
+    @Override
+    public ResultBean<List<SalerBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
+        return appBusSalesOrderService.saleOrderInputLenderVins(sale0rderSid);
+    }
+
 }

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

@@ -70,6 +70,8 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelD
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
 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.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
 import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
 import com.yxt.anrui.crm.api.crmvehicledemand.CrmVehicledemandFeign;
@@ -83,10 +85,8 @@ import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanOrderPreloanVo;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanCreditApplyFeign;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanQuery;
 import com.yxt.anrui.riskcenter.api.loanpreloancreditapply.LoanPreloanVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.InputLenderVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.LoanPreloansQuery;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.LoanPreloansVo;
-import com.yxt.anrui.terminal.api.autoservice.saleOrders.OrderLoanVo;
+import com.yxt.anrui.terminal.api.autoservice.intermediary.MiddlemanVo;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.FlowOrderVo;
 import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto;
@@ -178,6 +178,8 @@ public class AppBusSalesOrderService {
     private CommonService commonService;
     @Autowired
     private AppSubsetVersionFeign appSubsetVersionFeign;
+    @Autowired
+    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
 
     /************************************* 销售订单接口 *********************************************/
 
@@ -776,8 +778,8 @@ public class AppBusSalesOrderService {
         return busSalesOrderFeign.deleteSaleOrderInputLender(sid);
     }
 
-    public ResultBean saleOrderInputLenderNum(String sid, String num) {
-        return busSalesOrderFeign.saveBorrowNum(sid, num);
+    public ResultBean saleOrderInputLenderNum(String sid, List<String> vins) {
+        return busSalesOrderFeign.saveBorrowNum(sid, vins);
     }
 
     public ResultBean saleOrderInputLenderOwn(String saleOrderSid) {
@@ -839,4 +841,14 @@ public class AppBusSalesOrderService {
         ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputVin(vinDto);
         return resultBean;
     }
+
+    public ResultBean<List<SalerBorrowVo>> saleOrderInputLenderVins(String sale0rderSid) {
+        ResultBean<List<SalerBorrowVo>> rb = ResultBean.fireFail();
+        ResultBean<List<BusVehicleBorrowVo>> resultBean = busSalesOrderVehicleFeign.saleOrderInputLenderVins(sale0rderSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        List<SalerBorrowVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SalerBorrowVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
 }