diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 956a4c6d7e..fbca4c4883 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/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 vins); @ApiOperation("保存销售订单贷款人自己") @PostMapping("/saleOrderInputLenderOwn/{saleOrderSid}") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index bb7676ad30..a82c2e2afd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/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 vins) { return null; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java index a12aa88e20..cddcb68cfb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListDto.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java index e655245c34..555eacef7b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/vin/VinListVo2.java +++ b/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; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusBorrowVehicleVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusBorrowVehicleVo.java new file mode 100644 index 0000000000..9cded7b35c --- /dev/null +++ b/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; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 641bf65fc4..23bddff674 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/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 selectByOrderSidAndVehSid(@RequestParam("sid") String sid, @RequestParam("vehSid") String vehSid); + + @ApiOperation("贷款人选择车辆") + @GetMapping("/saleOrderInputLenderVins/{sale0rderSid}") + @ResponseBody + ResultBean> saleOrderInputLenderVins(@PathVariable("sale0rderSid") String sale0rderSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index 340b348ea1..d8cbab0032 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/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> saleOrderInputLenderVins(String sale0rderSid) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleBorrowVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleBorrowVo.java new file mode 100644 index 0000000000..b6747bb3f8 --- /dev/null +++ b/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; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index 29bdf4b200..b560df9e71 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/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 vins) { + return busSalesOrderService.saveBorrowNum(sid,vins); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 35ea0a0fb1..f8bc7b4461 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/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 busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid); + List busSalesOrderVehicleList = busSalesOrderVehicleService.selectListByOrdersSid(saleOrderSid); busSalesOrderVehicleList.removeAll(Collections.singleton(null)); List borrowSidList = busSalesOrderVehicleList.stream().map(v -> v.getBorrowerSid()).collect(Collectors.toList()); List 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 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 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 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 vins) { ResultBean rb = ResultBean.fireFail(); BusSalesOrderBorrower busSalesOrderBorrower = busSalesOrderBorrowerService.fetchBySid(sid); if (busSalesOrderBorrower == null) { @@ -7446,13 +7471,15 @@ public class BusSalesOrderService extends MybatisBaseService 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); } //更新业务状态码 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index b7f40d882c..e0635c5177 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/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 selectByOrderSid(@Param("salesOrderSid") String salesOrderSid); - List selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid); - List selectByOrderSid3(@Param("salesOrderSid") String salesOrderSid); + List selectByOrderSid2(@Param("salesOrderSid") String salesOrderSid,@Param("borrowSid") String borrowSid); + List 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 selectListByOrdersSid(String saleOrderSid); + List 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 saleOrderInputLenderVins(String sale0rderSid); + + BusSalesOrderVehicle selectBySidAndOrderBo(@Param("saleOrderSid") String saleOrderSid, @Param("pos") String pos); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index eea83b48b2..db649fb206 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -80,16 +80,18 @@ where salesOrderSid = #{salesOrderSid} - + 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 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 = '') + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java index e13359c240..a8aa24e57a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java +++ b/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> saleOrderInputLenderVins(String sale0rderSid) { + return busSalesOrderVehicleService.saleOrderInputLenderVins(sale0rderSid); + } + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java index 864e1bbf43..467c5552f4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java +++ b/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 selectListByOrderSid2(String saleOrderSid, String borrowSid) { + public List selectListByOrderSid2(String saleOrderSid, String borrowSid) { return baseMapper.selectByOrderSid2(saleOrderSid, borrowSid); } - public List selectListByOrderSid3(String saleOrderSid) { + public List selectListByOrderSid3(String saleOrderSid) { return baseMapper.selectByOrderSid3(saleOrderSid); } @@ -582,7 +582,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectListByOrdersSid(String saleOrderSid) { + public List selectListByOrdersSid(String saleOrderSid) { return baseMapper.selectListByOrdersSid(saleOrderSid); } @@ -595,4 +595,14 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> saleOrderInputLenderVins(String sale0rderSid) { + ResultBean> rb = ResultBean.fireFail(); + List list = baseMapper.saleOrderInputLenderVins(sale0rderSid); + return rb.success().setData(list); + } + + public BusSalesOrderVehicle selectBySidAndOrderBo(String saleOrderSid, String pos) { + return baseMapper.selectBySidAndOrderBo(saleOrderSid,pos); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index d85311bc34..0f5da014a5 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/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 vins); @ApiOperation("保存销售订单贷款人自己") @PostMapping("/save/saleOrderInputLenderOwn/{saleOrderSid}") @@ -359,4 +359,11 @@ public interface AppBusSalesOrderFeign { @PostMapping("/getPreLoanList") @ResponseBody ResultBean> getPreLoanList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("贷款人选择车辆列表") + @GetMapping("/init/saleOrderInputLenderVins/{sale0rderSid}") + @ResponseBody + ResultBean> saleOrderInputLenderVins(@PathVariable("sale0rderSid") String sale0rderSid); + + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index a648a00e04..bea6209638 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/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 vins) { return null; } @@ -325,4 +325,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean> getPreLoanList(PagerQuery pagerQuery) { return null; } + + @Override + public ResultBean> saleOrderInputLenderVins(String sale0rderSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/SalerBorrowVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/SalerBorrowVo.java new file mode 100644 index 0000000000..320d73da6f --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index aeedaa68e1..5fdff75f00 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/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 vins) { + return appBusSalesOrderService.saleOrderInputLenderNum(sid,vins); } @Override @@ -419,4 +419,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.getPreLoanList(pagerQuery); } + @Override + public ResultBean> saleOrderInputLenderVins(String sale0rderSid) { + return appBusSalesOrderService.saleOrderInputLenderVins(sale0rderSid); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 93abde32ae..bee8c10b6a 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/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 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> saleOrderInputLenderVins(String sale0rderSid) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> resultBean = busSalesOrderVehicleFeign.saleOrderInputLenderVins(sale0rderSid); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + List 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); + } } \ No newline at end of file