diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java index 8988a4b965..0d1349f18a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java @@ -25,16 +25,14 @@ *********************************************************/ package com.yxt.anrui.base.api.basevehmodelconfig; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; 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.web.bind.annotation.*; -import java.util.List; - /** * Project: anrui-base(车型信息)
* File: BaseVehmodelConfigFeign.java
@@ -88,6 +86,10 @@ public interface BaseVehmodelConfigFeign { @GetMapping("/getModelAndConfigDetails/{modelSid}/{configSid}") public ResultBean getModelAndConfigDetails(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid); + @ApiOperation("根据车型sid和配置sid查询信息") + @GetMapping("selectOne") + ResultBean selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端车型库列表") @@ -105,7 +107,7 @@ public interface BaseVehmodelConfigFeign { @ApiOperation("意向车型查询车型数据") @GetMapping("/getAppCommonlyUsedModelDetails/{userSid}/{modelSid}/{configSid}") public ResultBean getAppIntentionVehicleVo(@RequestParam("userSid") String userSid, - @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid); + @RequestParam("modelSid") String modelSid, @RequestParam("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/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java index 3aa0bb48e1..e227fc131d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java @@ -25,14 +25,11 @@ *********************************************************/ package com.yxt.anrui.base.api.basevehmodelconfig; -import com.yxt.anrui.base.api.busvehicleinquiry.AppBusVehicleInquiryListVo; 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.Component; -import java.util.List; - /** * Project: anrui-base(车型信息)
* File: BaseVehmodelConfigFeignFallback.java
@@ -81,6 +78,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign return null; } + @Override + public ResultBean selectOne(String modelSid, String configSid) { + return null; + } + @Override public ResultBean> getAppCommonlyUsedModelsByPageList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java new file mode 100644 index 0000000000..e8ff99f72c --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.base.api.basevehmodelconfig; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/29 10:59 + * @Description + */ +@Data +public class BaseVehmodelVo implements Vo { + private static final long serialVersionUID = 2821138970776546215L; + + @JsonSerialize(using = ToStringSerializer.class) + private String guidedPrice; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java index fa7b78af9e..a916b06529 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java @@ -27,10 +27,9 @@ package com.yxt.anrui.base.biz.basevehmodelconfig; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; 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.AppCurrentCarModelByPageListVo; import com.yxt.anrui.base.api.basevehmodelconfig.*; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; @@ -116,4 +115,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper int delByModelSid(String sid); BaseVehmodelConfigVo fetchAllBySid(String sid); + + BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml index 5053ff8785..2c5a206652 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml @@ -4,11 +4,10 @@ SELECT bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid - LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid + LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid + LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid ${ew.sqlSegment} @@ -204,8 +203,15 @@ bvc.`manufactorSettlementPrice`, bvc.`guidedPrice` FROM base_vehmodel_config bvc - LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` - LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid` + LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid` + LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid` WHERE bvc.sid = #{sid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java index 467bf58661..8f068b2675 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java @@ -26,9 +26,7 @@ package com.yxt.anrui.base.biz.basevehmodelconfig; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; import com.yxt.anrui.base.api.basevehmodelconfig.*; -import com.yxt.anrui.base.api.busvehicleinquiry.AppBusVehicleInquiryListVo; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -38,9 +36,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - /** * Project: anrui-base(车型信息)
* File: BaseVehmodelConfigFeignFallback.java
@@ -89,7 +84,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { @Override public ResultBean checkRelieve(String modelSid, String configurationItemsSid) { - return baseVehmodelConfigService.checkRelieve(modelSid,configurationItemsSid); + return baseVehmodelConfigService.checkRelieve(modelSid, configurationItemsSid); } @Override @@ -115,6 +110,11 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { return new ResultBean().success().setData(vo); } + @Override + public ResultBean selectOne(String modelSid, String configSid) { + return baseVehmodelConfigService.selectOne(modelSid, configSid); + } + /** * 手机端车型库列表 * @@ -149,7 +149,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign { @Override public ResultBean getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) { - AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid,modelSid,configSid); + AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid, modelSid, configSid); return new ResultBean().success().setData(vo); } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 6c933f8b9b..04c5359482 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -29,8 +29,6 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; -import com.yxt.anrui.base.api.basevehicle.AppCurrentCarByPageListQuery; -import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; import com.yxt.anrui.base.api.basevehicle.ConfigInfo; import com.yxt.anrui.base.api.basevehmodelconfig.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; @@ -38,7 +36,6 @@ import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -48,7 +45,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** @@ -347,12 +343,12 @@ public class BaseVehmodelConfigService extends MybatisBaseService selectOne(String modelSid, String configSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid); + return rb.success().setData(vo); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java index 1745ee9e95..5bbf033765 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/pc/PcCrmVehicleDemandVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.crm.api.crmvehicledemand.pc; +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; @@ -24,4 +26,7 @@ public class PcCrmVehicleDemandVo implements Vo { @ApiModelProperty(value = "常用配置") private String config; + @ApiModelProperty(value = "单台指导价") + @JsonSerialize(using = ToStringSerializer.class) + private String guidedPrice; } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java index ca6eed5d6f..4f2c294de5 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmvehicledemand/CrmVehicledemandService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehmodelconfig.AppModelVeDetailVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; +import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.crm.api.crmfindemand.CrmFindemand; import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandDto; import com.yxt.anrui.crm.api.crmfindemand.CrmFindemandVo; @@ -377,6 +378,16 @@ public class CrmVehicledemandService extends MybatisBaseService page = PagerUtil.queryToPage(pcCrmVehicleDemandQuery); IPage pagging = baseMapper.selectPagePc(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); + List list = p.getRecords(); + if (list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + //根据车型sid及配置sid查询单台指导价 + ResultBean voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid()); + if (voResultBean.getSuccess()) { + list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice()); + } + } + } return p; }