Merge remote-tracking branch 'origin/master'

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

@@ -305,6 +305,11 @@ public interface AppBusSalesOrderFeign {
     @ResponseBody
     ResultBean saveSaleOrderVin(@RequestBody InputVinDto dto);
 
+    @ApiOperation("保存销售订单车架号")
+    @PostMapping("/save/saleOrderVin2")
+    @ResponseBody
+    ResultBean saveSaleOrderVin2(@RequestBody InputVinDto dto);
+
     @ApiOperation("App销售订单查询")
     @PostMapping("/getSaleOrdersByOrgPath")
     @ResponseBody

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

@@ -271,6 +271,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean saveSaleOrderVin2(InputVinDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(PagerQuery<BusOrderQuery> pq) {
         return null;

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

@@ -16,4 +16,9 @@ public class InputVinListDto implements Dto {
     private String linkNo;
     @JsonProperty("carSid")
     private String linkSid;
+
+    private String groupName;
+    private String pos;
+    private boolean state;
+    private Integer viewType;
 }

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

@@ -364,6 +364,11 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
         return appBusSalesOrderService.saveSaleOrderVin(dto);
     }
 
+    @Override
+    public ResultBean saveSaleOrderVin2(InputVinDto dto) {
+        return appBusSalesOrderService.saveSaleOrderVin2(dto);
+    }
+
     @Override
     public ResultBean<PagerVo<BusOrderSalesVo>> getSaleOrdersByOrgPath(PagerQuery<BusOrderQuery> pq) {
         return appBusSalesOrderService.getSaleOrdersByOrgPath(pq);

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

@@ -798,7 +798,7 @@ public class AppBusSalesOrderService {
         PagerQuery<LoanPreloanQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
         ResultBean<PagerVo<LoanPreloanVo>> resultBean = loanPreloanCreditApplyFeign.getOrderLoanPagerList(pq);
         PagerVo<LoanPreloansVo> v = new PagerVo<>();
-        if(resultBean.getData() != null){
+        if (resultBean.getData() != null) {
             List<LoanPreloansVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), LoanPreloansVo.class)).collect(Collectors.toList());
 
             BeanUtil.copyProperties(resultBean.getData(), v);
@@ -813,10 +813,30 @@ public class AppBusSalesOrderService {
             }
             v.setRecords(voList);
             return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
-        }else{
+        } else {
             return rb.success().setMsg("当前共查询到" + v.getTotal() + "条记录").setData(v);
         }
 
 
     }
+
+    public ResultBean saveSaleOrderVin2(InputVinDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        VinDto vinDto = new VinDto();
+        List<InputVinListDto> vinList = dto.getVinList();
+        List<InputVinListDto> newVinList = new ArrayList<>();
+        if (!vinList.isEmpty()) {
+            for (InputVinListDto inputVinListDto : vinList) {
+                if (null != inputVinListDto.getViewType()) {
+                    if (inputVinListDto.getViewType() != 1) {
+                        newVinList.add(inputVinListDto);
+                    }
+                }
+            }
+        }
+        dto.setVinList(newVinList);
+        BeanUtil.copyProperties(dto, vinDto);
+        ResultBean resultBean = busSalesOrderFeign.saveSaleOrderInputVin(vinDto);
+        return resultBean;
+    }
 }