销售订单-车型现车数量及分页

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<PagerVo<BaseVehicleActualVo>> vehicleActualList(@RequestBody PagerQuery<BaseVehicleReturnQuery> pagerQuery);
 
+    @ApiOperation("销售订单选择现车数量及列表")
+    @GetMapping("/selectVo")
+    ResultBean<PcBaseVehicleOrderVo> selectVo(@SpringQueryMap PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery);
+
     /***************************************************** App接口 **********************************************************/
 
     @ApiOperation("手机端现车分页列表")
@@ -228,4 +233,6 @@ public interface BaseVehicleFeign {
     @ApiOperation("获取车型配置总结（即常用配置一句话描述）")
     @GetMapping("/carConfigSummary/{modelSid}/{configSid}")
     public ResultBean<AppCarConfigSummaryVo> getCarConfigSummary(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
+
+
 }

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<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppCurrentCarModelByPageListVo>> getAppCurrentCarByPageList(PagerQuery<AppCurrentCarByPageListQuery> pagerQuery) {
         return null;

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;
+
+}

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;
+}

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<PcBaseVehicleOrderListVo> pcBaseVehicleOrderList;
+}

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<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+        return baseVehicleService.selectVo(pcBaseVehicleOrderQuery);
+    }
+
     /**
      * 手机端现车列表
      *

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<BaseVehicleMapper, Ba
         }
         return qw;
     }
+
+    public ResultBean<PcBaseVehicleOrderVo> selectVo(PcBaseVehicleOrderQuery pcBaseVehicleOrderQuery) {
+        ResultBean<PcBaseVehicleOrderVo> rb = ResultBean.fireFail();
+        //判断选择的是意向车型还是虚拟订单还是车型配置
+        int type = pcBaseVehicleOrderQuery.getType();
+        if (type == 1 || type == 3) {
+            //查询该车型该配置下的所有现车的数量
+
+
+        } else {
+
+        }
+        return rb.success();
+
+    }
 }

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<BusSalesOrderVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
-    @ApiOperation("获取现车列表及数量")
-    @GetMapping("/selectVo")
-    @ResponseBody
-    ResultBean<BusSalesOrderVehicleVo> selectVo(@SpringQueryMap BusSalesOrderVehicleQuery busSalesOrderVehicleQuery);
 }

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;
 }

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<BusSalesOrderVehicleVo> selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) {
-        return busSalesOrderVehicleService.selectVo(busSalesOrderVehicleQuery);
-    }
 }

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<BusSalesOrde
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
-
-    public ResultBean<BusSalesOrderVehicleVo> selectVo(BusSalesOrderVehicleQuery busSalesOrderVehicleQuery) {
-        //判断选择的是意向车型还是虚拟订单还是车型配置
-        int type = busSalesOrderVehicleQuery.getType();
-        if (type == 1 || type == 3) {
-            //查询该车型该配置下的所有现车的数量
-
-
-        } else {
-
-        }
-        return null;
-    }
 }