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 c948d916a9..65b4811465 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; @@ -207,6 +208,10 @@ public interface BaseVehicleFeign { @PostMapping("/selectVo") ResultBean> selectVo(@RequestBody PagerQuery pcBaseVehicleOrderQuery); + @ApiOperation("销售订单-根据车型和配置sid查询现车的数量") + @GetMapping("/selectCount") + ResultBean selectCount(@SpringQueryMap PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") 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 ff15dea6f0..d52015d984 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 @@ -129,6 +129,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) { + 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/PcBaseVehicleOrderCountQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderCountQuery.java new file mode 100644 index 0000000000..1107eecd96 --- /dev/null +++ b/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; + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 46d38abd3c..24d05a8c3f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/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 { IPage getModelNowCarList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); BaseVehicleVo fetchVehicle(QueryWrapper qw); + + /** + * 根据车型配置及车型查询现车的数量 + * @param qw 查询条件 + * @return + */ + Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 86ea97cbdb..bc35ba31af 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -670,4 +670,10 @@ + + \ No newline at end of file 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 2a8cdd448c..a33d536e96 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 @@ -339,6 +339,11 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) { + return baseVehicleService.selectCount(pcBaseVehicleOrderCountQuery); + } + /** * 手机端现车列表 * 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 671c28ee8e..8517294f94 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 @@ -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 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 selectCount(PcBaseVehicleOrderCountQuery query) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper 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> stringList = pcBusMainDepositFeign.selectVehicleList(vehicleQuery); + if (stringList.getSuccess()) { + qw.in("bv.sid", stringList.getData()); + } + } + } + int count = baseMapper.selectVehicleCount(qw); + return rb.success().setData(count); + + } } \ No newline at end of file