销售订单-根据车型及配置查询现车数量

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;
 
@@ -207,6 +208,10 @@ public interface BaseVehicleFeign {
     @PostMapping("/selectVo")
     ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(@RequestBody PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery);
 
+    @ApiOperation("销售订单-根据车型和配置sid查询现车的数量")
+    @GetMapping("/selectCount")
+    ResultBean<Integer> selectCount(@SpringQueryMap PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery);
+
     /***************************************************** App接口 **********************************************************/
 
     @ApiOperation("手机端现车分页列表")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -129,6 +129,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<Integer> selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) {
+        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/PcBaseVehicleOrderCountQuery.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/16 10:33
+ * @Description
+ */
+@Data
+public class PcBaseVehicleOrderCountQuery implements Query {
+    private static final long serialVersionUID = 2155664628760571295L;
+
+    @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-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.*;
-import com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo;
 import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
@@ -326,4 +324,11 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<AppBaseVinNowCarVo> getModelNowCarList(IPage<AppBaseVinNowCarVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBaseVinNowCarVo> qw);
 
     BaseVehicleVo fetchVehicle(QueryWrapper<BaseVehicleVo> qw);
+
+    /**
+     * 根据车型配置及车型查询现车的数量
+     * @param qw 查询条件
+     * @return
+     */
+    Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -670,4 +670,10 @@
     <select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
 
     </select>
+
+    <select id="selectVehicleCount" resultType="java.lang.Integer">
+        select count(*)
+        from base_vehicle bv
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -339,6 +339,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<Integer> selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) {
+        return baseVehicleService.selectCount(pcBaseVehicleOrderCountQuery);
+    }
+
     /**
      * 手机端现车列表
      *

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -8,8 +8,6 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
 import com.yxt.anrui.base.api.basevehicle.*;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
 import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
-import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
-import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
 import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign;
@@ -17,10 +15,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -988,7 +983,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             }
             //锁定状态
             qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
-            qw.eq("bv.vehicleStateValue", "现车");
+            qw.eq("bv.vehicleStateValue", "库存");
         }
         return qw;
     }
@@ -1136,7 +1131,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             //结算状态：0没买断
             qw.eq("bv.settlementStatus", "0");
             //车辆状态：现车
-            qw.eq("bv.vehicleStateValue", "现车");
+            qw.eq("bv.vehicleStateValue", "库存");
         }
         return qw;
     }
@@ -1237,4 +1232,33 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         }
         return qw;
     }
+
+    /**
+     * 根据车型及车型配置查询
+     * @param query 查询条件
+     * @return
+     */
+    public ResultBean<Integer> selectCount(PcBaseVehicleOrderCountQuery query) {
+        ResultBean<Integer> rb = ResultBean.fireFail();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        if (query != null) {
+            qw.eq("bv.modelSid", query.getModelSid());//车型sid
+            qw.eq("bv.modelConfigSid", query.getModelConfigSid());//配置sid
+            if (query.getType() == 2) {
+                //根据业务员sid和客户sid查询所有的虚拟虚拟订单的车辆
+                PcBusMainDepositVehicleQuery vehicleQuery = new PcBusMainDepositVehicleQuery();
+                vehicleQuery.setCustomerSid(query.getCustomerSid());
+                vehicleQuery.setModelConfigSid(query.getModelConfigSid());
+                vehicleQuery.setStaffSid(query.getStaffSid());
+                vehicleQuery.setModelSid(query.getModelSid());
+                ResultBean<List<String>> stringList = pcBusMainDepositFeign.selectVehicleList(vehicleQuery);
+                if (stringList.getSuccess()) {
+                    qw.in("bv.sid", stringList.getData());
+                }
+            }
+        }
+        int count = baseMapper.selectVehicleCount(qw);
+        return rb.success().setData(count);
+
+    }
 }