From e0628d9a21297ff1908b78606c90fd7a7fe753d3 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 15 Sep 2023 17:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=BD=95=E5=85=A5=E8=BD=A6=E6=9E=B6=E5=8F=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleOrders/AppBusSalesOrderFeign.java | 5 ++++ .../AppBusSalesOrderFeignFallback.java | 5 ++++ .../saleOrders/vininput/InputVinListDto.java | 5 ++++ .../saleOrders/AppBusSalesOrderRest.java | 5 ++++ .../saleOrders/AppBusSalesOrderService.java | 24 +++++++++++++++++-- 5 files changed, 42 insertions(+), 2 deletions(-) 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 81c87e7aa7..d85311bc34 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 @@ -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 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 0d95e37add..a648a00e04 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 @@ -271,6 +271,11 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { return null; } + @Override + public ResultBean saveSaleOrderVin2(InputVinDto dto) { + return null; + } + @Override public ResultBean> getSaleOrdersByOrgPath(PagerQuery pq) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java index a8f8cf8eee..83809864d2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vininput/InputVinListDto.java +++ b/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; } 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 d025bc4552..aeedaa68e1 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 @@ -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> getSaleOrdersByOrgPath(PagerQuery pq) { return appBusSalesOrderService.getSaleOrdersByOrgPath(pq); 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 8e7eb00a5b..93abde32ae 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 @@ -798,7 +798,7 @@ public class AppBusSalesOrderService { PagerQuery pq = CoverUtils.getPagerQuery(pagerQuery); ResultBean> resultBean = loanPreloanCreditApplyFeign.getOrderLoanPagerList(pq); PagerVo v = new PagerVo<>(); - if(resultBean.getData() != null){ + if (resultBean.getData() != null) { List 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 vinList = dto.getVinList(); + List 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; + } } \ No newline at end of file