From 6583b0ec985746c7a9e9cc32cf30ffa46a4d7b0d Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 28 Apr 2022 19:47:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95-=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E7=8E=B0=E8=BD=A6=E6=95=B0=E9=87=8F=E5=8F=8A=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 7 +++++ .../basevehicle/BaseVehicleFeignFallback.java | 5 ++++ .../basevehicle/PcBaseVehicleOrderListVo.java | 25 +++++++++++++++++ .../basevehicle/PcBaseVehicleOrderQuery.java | 27 +++++++++++++++++++ .../api/basevehicle/PcBaseVehicleOrderVo.java | 22 +++++++++++++++ .../base/biz/basevehicle/BaseVehicleRest.java | 5 ++++ .../biz/basevehicle/BaseVehicleService.java | 15 +++++++++++ .../BusSalesOrderVehicleFeign.java | 6 ----- .../BusSalesOrderVehicleQuery.java | 12 --------- .../BusSalesOrderVehicleRest.java | 5 ---- .../BusSalesOrderVehicleService.java | 14 ---------- 11 files changed, 106 insertions(+), 37 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index cbe1ac4649..b9315460c6 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -8,6 +8,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -203,6 +204,10 @@ public interface BaseVehicleFeign { @PostMapping("/vehicleActualList") ResultBean> vehicleActualList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("销售订单选择现车数量及列表") + @GetMapping("/selectVo") + ResultBean selectVo(@SpringQueryMap PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") @@ -228,4 +233,6 @@ public interface BaseVehicleFeign { @ApiOperation("获取车型配置总结（即常用配置一句话描述）") @GetMapping("/carConfigSummary/{modelSid}/{configSid}") public ResultBean getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); + + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 38b27120d7..6f0c04ed05 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -124,6 +124,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java new file mode 100644 index 0000000000..cc2d64cc86 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderListVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/28 16:58 + * @Description + */ +@Data +public class PcBaseVehicleOrderListVo implements Vo { + private static final long serialVersionUID = 3105577353109956233L; + + @ApiModelProperty("车架号") + private String linkNo; + @ApiModelProperty("车辆存放地点") + private String linkText; + @ApiModelProperty("车辆sid") + private String linkSid; + @ApiModelProperty(value = "是否是虚拟订单:1是，0不是") + private int isFictitious; + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java new file mode 100644 index 0000000000..6950842390 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.base.api.basevehicle; + +/** + * @Author dimengzhe + * @Date 2022/4/28 17:03 + * @Description + */ + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class PcBaseVehicleOrderQuery implements Query { + private static final long serialVersionUID = 8712247663291062678L; + + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "车型配置sid") + private String modelConfigSid; + @ApiModelProperty(value = "业务员sid") + private String staffSid; + @ApiModelProperty(value = "客户sid") + private String customerSid; + @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择") + private Integer type; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java new file mode 100644 index 0000000000..d9620049d1 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/28 16:57 + * @Description + */ +@Data +public class PcBaseVehicleOrderVo implements Vo { + private static final long serialVersionUID = 3137353876161746499L; + + @ApiModelProperty(value = "现车的数量") + private int num; + @ApiModelProperty(value = "点击选择出现的现车列表") + private List pcBaseVehicleOrderList; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 28a5dce098..913fc1456c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -333,6 +333,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) { + return baseVehicleService.selectVo(pcBaseVehicleOrderQuery); + } + /** * 手机端现车列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 4ce0e628f0..b65382b13d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1149,4 +1149,19 @@ public class BaseVehicleService extends MybatisBaseService selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) { + ResultBean rb = ResultBean.fireFail(); + //判断选择的是意向车型还是虚拟订单还是车型配置 + int type = pcBaseVehicleOrderQuery.getType(); + if (type == 1 || type == 3) { + //查询该车型该配置下的所有现车的数量 + + + } else { + + } + return rb.success(); + + } } \ No newline at end of file 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 209557e251..aa7606508e 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 @@ -31,7 +31,6 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; /** @@ -74,9 +73,4 @@ public interface BusSalesOrderVehicleFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - - @ApiOperation("获取现车列表及数量") - @GetMapping("/selectVo") - @ResponseBody - ResultBean selectVo(@SpringQueryMap BusSalesOrderVehicleQuery busSalesOrderVehicleQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java index ba180226e6..887e8ebb86 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleQuery.java @@ -27,9 +27,7 @@ package com.yxt.anrui.buscenter.api.bussalesordervehicle; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -50,14 +48,4 @@ import lombok.Data; public class BusSalesOrderVehicleQuery implements Query { private static final long serialVersionUID = 9092383680701191970L; - @ApiModelProperty(value = "车型sid") - private String modelSid; - @ApiModelProperty(value = "车型配置sid") - private String modelConfigSid; - @ApiModelProperty(value = "业务员sid") - private String staffSid; - @ApiModelProperty(value = "客户sid") - private String customerSid; - @ApiModelProperty(value = "类型：1意向车型选择、2虚拟订单选择、3车型选择") - private Integer type; } 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 119f49f7a9..139f65b0fb 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 @@ -90,9 +90,4 @@ public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign { BusSalesOrderVehicleDetailsVo vo = busSalesOrderVehicleService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } - - @Override - public ResultBean selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) { - return busSalesOrderVehicleService.selectVo(busSalesOrderVehicleQuery); - } } 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 f38042f930..9e9ee6873d 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 @@ -32,7 +32,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; @@ -79,17 +78,4 @@ public class BusSalesOrderVehicleService extends MybatisBaseService selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) { - //判断选择的是意向车型还是虚拟订单还是车型配置 - int type = busSalesOrderVehicleQuery.getType(); - if (type == 1 || type == 3) { - //查询该车型该配置下的所有现车的数量 - - - } else { - - } - return null; - } } \ No newline at end of file