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 51249708ab..c84a0ddf50 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 @@ -335,4 +335,9 @@ public interface BusSalesOrderFeign { @PostMapping("/saveContract") @ResponseBody ResultBean saveContract(@RequestParam("sid") String sid); + + @ApiOperation("根据销售订单查询销售订单相关表") + @GetMapping("/getSalesOrderOne") + @ResponseBody + ResultBean getSalesOrderOne(@RequestParam("sid")String sid); } \ No newline at end of file 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 6f80b8576d..221718ce25 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 @@ -310,4 +310,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean saveContract(String sid) { return null; } + + @Override + public ResultBean getSalesOrderOne(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java new file mode 100644 index 0000000000..12afaf79c0 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrdersVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.buscenter.api.bussalesorder; + +import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/8/3 + **/ +@Data +public class BusSalesOrdersVo implements Vo { + private static final long serialVersionUID = 4731412472734010267L; + + private BusSalesOrder busSalesOrder; + + private BusSalesOrderModel busSalesOrderModel; + + private BusSalesOrderPrice busSalesOrderPrice; +} 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 606088802b..cdf73919a4 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 @@ -391,4 +391,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean saveContract(String sid) { return busSalesOrderService.saveContractOne(sid); } + + @Override + public ResultBean getSalesOrderOne(String sid) { + return busSalesOrderService.getSalesOrderOne(sid); + } } 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 1241784203..76b6df0719 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 @@ -3409,28 +3409,34 @@ public class BusSalesOrderService extends MybatisBaseService vinLists = busSalesOrderVehicleService.selectLists(sid); - //包含采购系统的车架号 - List vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); - List orderVinList = busSalesOrderVehicleService.selectList(sid); - if (!vinList.isEmpty()) { - for (int i = 0; i < vinLists.size(); i++) { - VinListsVo vinListsVo = vinLists.get(i); - BigDecimal initBigDecimalTwo = BigDecimal.ZERO; - //根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额 - ResultBean> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), busSalesOrder.getUseOrgSid()); - if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) { - List stringList = listResultBean.getData(); - initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); - } - if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) { - vinList.set(i, vinList.get(i) + ",促销(" + initBigDecimalTwo.toString() + "元)"); + if(StringUtils.isNotBlank(busSalesOrder.getNowCarUnknownVinNum())){ + List vinList = new ArrayList<>(); + vinList.add("不确定车架号("+busSalesOrder.getNowCarUnknownVinNum()+")"); + modelInfo.setVinList(vinList); + }else{ + //查询车架号 + List vinLists = busSalesOrderVehicleService.selectLists(sid); + //包含采购系统的车架号 + List vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); + List orderVinList = busSalesOrderVehicleService.selectList(sid); + if (!vinList.isEmpty()) { + for (int i = 0; i < vinLists.size(); i++) { + VinListsVo vinListsVo = vinLists.get(i); + BigDecimal initBigDecimalTwo = BigDecimal.ZERO; + //根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额 + ResultBean> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), busSalesOrder.getUseOrgSid()); + if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) { + List stringList = listResultBean.getData(); + initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add)); + } + if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) { + vinList.set(i, vinList.get(i) + ",促销(" + initBigDecimalTwo.toString() + "元)"); + } } } + modelInfo.setVinList(vinList); + modelInfo.setOrderVinList(orderVinList); } - modelInfo.setVinList(vinList); - modelInfo.setOrderVinList(orderVinList); } else { if ("1".equals(modelInfo.getType())) { //查询采购订单编号 @@ -7027,4 +7033,16 @@ public class BusSalesOrderService extends MybatisBaseService getSalesOrderOne(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrdersVo busSalesOrdersVo = new BusSalesOrdersVo(); + BusSalesOrder busSalesOrder = fetchBySid(sid); + BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid); + BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid); + busSalesOrdersVo.setBusSalesOrder(busSalesOrder); + busSalesOrdersVo.setBusSalesOrderModel(busSalesOrderModel); + busSalesOrdersVo.setBusSalesOrderPrice(busSalesOrderPrice); + return rb.success().setData(busSalesOrdersVo); + } } \ No newline at end of file