diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java index dac350699e..9ecc7c670b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java @@ -36,6 +36,8 @@ public class BusOrderVo implements Vo { private String customerName; //联系电话 private String mobile; + //证件号码 + private String IDNumber; //品牌 //单台成交价 //数量 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java index c76f3a77a1..7fc48aca41 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java @@ -63,6 +63,10 @@ public interface BusOrderVehicleFeign { @PostMapping("/checkFinGinvoiceapply") ResultBean checkFinGinvoiceapply(@RequestBody List list); + @ApiOperation("根据订单sid查询车辆车架号") + @GetMapping("/getVehicleVINNoByOrderSid/{orderSid}") + ResultBean getVehicleVINNoByOrderSid(@PathVariable ("orderSid") String orderSid); + /******************************************手机端接口********************************************/ @ApiOperation("手机端根据销售订单sid查询车辆信息列表") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java index 44a2289ca5..10ba40befb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java @@ -68,6 +68,12 @@ public class BusOrderVehicleFeignFallback implements BusOrderVehicleFeign { return rb.setMsg("接口anrui-buscenter/busordervehicle/checkFinGinvoiceapply无法访问"); } + @Override + public ResultBean getVehicleVINNoByOrderSid(String orderSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busordervehicle/getVehicleVINNoByOrderSid无法访问"); + } + @Override public ResultBean getAppOrderVehicleListByOrderSid(String orderSid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java index 7e53306ba2..6de18d2051 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java @@ -41,6 +41,9 @@ public interface BusOrderVehicleMapper extends BaseMapper { */ List selectByOrderSid(String sid); + @Select("SELECT GROUP_CONCAT(VINNo) FROM bus_order_vehicle WHERE orderSid=#{orderSid}") + String getVehicleVINNoByOrderSid(@Param("orderSid") String orderSid); + List getBusOrderVehicle(String busOrderSid); IPage getExpectInvoiceList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java index fa675eefa4..eb2f547291 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java @@ -88,6 +88,11 @@ public class BusOrderVehicleRest implements BusOrderVehicleFeign { return busOrderVehicleService.checkFinGinvoiceapply(list); } + @Override + public ResultBean getVehicleVINNoByOrderSid(String orderSid) { + return new ResultBean().success().setData(busOrderVehicleService.getVehicleVINNoByOrderSid(orderSid)); + } + @Override public ResultBean> getAppOrderVehicleListByOrderSid(String orderSid) { List list = busOrderVehicleService.getAppOrderVehicleListByOrderSid(orderSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java index 4474d2f0ad..32b92233b5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java @@ -145,6 +145,15 @@ public class BusOrderVehicleService extends MybatisBaseService getBusOrderVehicle(String busOrderSid) { return baseMapper.getBusOrderVehicle(busOrderSid); }