From 84ad06c17c164a2db6541c54be12107ce53dfad6 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 22 Apr 2022 09:11:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=9C=AA=E5=94=AE=E4=B9=B0?= =?UTF-8?q?=E6=96=AD=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleActualVo.java | 41 +++++++ .../api/basevehicle/BaseVehicleFeign.java | 4 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../biz/basevehicle/BaseVehicleMapper.java | 26 ++++- .../biz/basevehicle/BaseVehicleMapper.xml | 23 ++++ .../base/biz/basevehicle/BaseVehicleRest.java | 7 ++ .../biz/basevehicle/BaseVehicleService.java | 103 +++++++++++++++++- .../BaseVehicleActualSalesService.java | 2 +- 8 files changed, 208 insertions(+), 3 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java new file mode 100644 index 0000000000..8f38f8a350 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleActualVo.java @@ -0,0 +1,41 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/22 8:49 + * @Description + */ +@Data +public class BaseVehicleActualVo implements Vo { + + private static final long serialVersionUID = -6048723646837616372L; + private String sid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "颜色") + private String color; + @ApiModelProperty(value = "存放地点") + private String location; + @ApiModelProperty(value = "销售指导价") + @JsonSerialize(using = ToStringSerializer.class) + private String guidedPrice; + + @ApiModelProperty(value = "常用配置") + private String configName; + @ApiModelProperty(value = "入库日期") + private String priceDate; + + @ApiModelProperty(value = "入库价") + @JsonSerialize(using = ToStringSerializer.class) + private String priced; +} 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 fbabaefbff..b00a1ffd39 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 @@ -189,6 +189,10 @@ public interface BaseVehicleFeign { @GetMapping("/selectStateByVinNo") ResultBean selectStateByVinNo(@RequestParam(value = "vinNoList") List vinNoList); + @ApiOperation("未售买断选择车辆分页列表") + @PostMapping("/vehicleReturnList") + ResultBean> vehicleActualList(@RequestBody PagerQuery pagerQuery); + /***************************************************** 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 2c78d4bd68..ad3bfe0815 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 @@ -114,6 +114,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> vehicleActualList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; 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 0e1c09e2de..1401125276 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 @@ -252,7 +252,7 @@ public interface BaseVehicleMapper extends BaseMapper { IPage getNowModelList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); /** - * 分页列表 + * 采购退库选择车辆分页列表 * * @param page 分页 * @param qw 查询条件 @@ -260,6 +260,14 @@ public interface BaseVehicleMapper extends BaseMapper { */ IPage vehicleReturnPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + /** + * 根据车架号更新车辆状态key和value + * + * @param stringList 车架号集合 + * @param vehicleState 车辆状态 + * @param vehicleStateValue 车辆状态vlaue + * @return + */ ResultBean updateByVinNo(@Param("vinNoList") List stringList, @Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue); /** @@ -278,5 +286,21 @@ public interface BaseVehicleMapper extends BaseMapper { */ List selectStatusByVinNo(@Param("vinNoList") List vinNoList); + /** + * 根据车架号更新车辆的结算状态 + * + * @param stringList 车架号集合 + * @param settlementStatus 结算状态 + * @return + */ int updateStatusByVinNo(@Param("vinNoList") List stringList, @Param("settlementStatus") String settlementStatus); + + /** + * 未售买断选择车辆分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage vehicleActualPageList(IPage page, @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 ebc25ab51c..fe3287ac91 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 @@ -613,4 +613,27 @@ #{vinNo} + + \ 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 a8dd8f716b..99c6b1da13 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 @@ -313,6 +313,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return baseVehicleService.selectStateByVinNo(vinNoList); } + @Override + public ResultBean> vehicleActualList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehicleActualList(pagerQuery); + return rb.success().setData(pv); + } + /** * 手机端现车列表 * 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 d6f36be43c..9064902549 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 @@ -969,6 +969,12 @@ public class BaseVehicleService extends MybatisBaseService stringList = baseVehicleUpdateQuery.getVinNoLis(); String vehicleState = baseVehicleUpdateQuery.getVehicleState(); @@ -996,7 +1002,7 @@ public class BaseVehicleService extends MybatisBaseService selectStatusByVinNo(List vinNoList) { @@ -1010,9 +1016,104 @@ public class BaseVehicleService extends MybatisBaseService stringList = baseVehicleUpdateQuery.getVinNoLis(); String settlementStatus = baseVehicleUpdateQuery.getSettlementStatus(); return baseMapper.updateStatusByVinNo(stringList, settlementStatus); } + + /** + * 未售买断选择车辆分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ + public PagerVo vehicleActualList(PagerQuery pagerQuery) { + IPage page = vehicleActualPageList(pagerQuery); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + /** + * 未售买断车辆的数据 + * + * @param pagerQuery 查询条件 + * @return + */ + private IPage vehicleActualPageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = vehicleActualWrapper(pagerQuery.getParams()); + return baseMapper.vehicleActualPageList(page, qw); + } + + /** + * 构造未售买断查询条件 + * + * @param params 查询条件 + * @return + */ + private QueryWrapper vehicleActualWrapper(BaseVehicleReturnQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.like("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.like("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.eq("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + if (params.getVinNoList().size() > 0) { + qw.notIn("bv.vinNo", params.getVinNoList()); + } + //结算状态：0没买断 + qw.eq("bv.settlementStatus", "0"); + //车辆状态：现车 + qw.eq("bv.vehicleStateValue", "现车"); + } + return qw; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index 55baad329c..75e01cb47e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -204,7 +204,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService