销售订单-意向车型分页列表添加返回单台指导价字段

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(车型信息) <br/>
  * File: BaseVehmodelConfigFeign.java <br/>
@@ -88,6 +86,10 @@ public interface BaseVehmodelConfigFeign {
     @GetMapping("/getModelAndConfigDetails/{modelSid}/{configSid}")
     public ResultBean<ExiCarConfigDetailVo> getModelAndConfigDetails(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
 
+    @ApiOperation("根据车型sid和配置sid查询信息")
+    @GetMapping("selectOne")
+    ResultBean<BaseVehmodelVo> 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<AppModelVeDetailVo> getAppIntentionVehicleVo(@RequestParam("userSid") String userSid,
-                                                                     @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
+                                                                   @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
 
 
 }

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(车型信息) <br/>
  * File: BaseVehmodelConfigFeignFallback.java <br/>
@@ -81,6 +78,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
         return null;
     }
 
+    @Override
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppCommonlyUsedModelsByPageListVo>> getAppCommonlyUsedModelsByPageList(PagerQuery<AppCommonlyUsedModelsByPageListQuery> pagerQuery) {
         return null;

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

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<BaseVehmodelConfig>
     int delByModelSid(String sid);
 
     BaseVehmodelConfigVo fetchAllBySid(String sid);
+
+    BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@@ -4,11 +4,10 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT
-        bvc.*,
-        bvm.modelName,
-        bvm.`vehicleVersionValue`,
-        bvm.`vehicleTypeCode`,
+        SELECT bvc.*,
+               bvm.modelName,
+               bvm.`vehicleVersionValue`,
+               bvm.`vehicleTypeCode`,
         <!--车身颜色-->
         bmc.carColor,
         <!--驾驶室规格-->
@@ -52,19 +51,19 @@
         <!--保险杠（欧曼）-->
         bmc.bumper,
         bmc.configName
-        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
+        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
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
-        SELECT * FROM base_vehmodel_config
+        SELECT *
+        FROM base_vehmodel_config
         <where>
             ${ew.sqlSegment}
         </where>
@@ -73,14 +72,14 @@
     <select id="getAppCommonlyUsedModelsByPageList"
             resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
         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
         <where>
             ${ew.sqlSegment}
         </where>
@@ -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}
     </select>
+
+    <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
+        select guidedPrice
+        from base_vehmodel_config
+        where modelSid = #{modelSid}
+          and configurationItemsSid = #{configSid}
+    </select>
 </mapper>

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(车型信息) <br/>
  * File: BaseVehmodelConfigFeignFallback.java <br/>
@@ -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<ExiCarConfigDetailVo>().success().setData(vo);
     }
 
+    @Override
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+        return baseVehmodelConfigService.selectOne(modelSid, configSid);
+    }
+
     /**
      * 手机端车型库列表
      *
@@ -149,7 +149,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
 
     @Override
     public ResultBean<AppModelVeDetailVo> getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
-        AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid,modelSid,configSid);
+        AppModelVeDetailVo vo = baseVehmodelConfigService.getAppIntentionVehicleVo(userSid, modelSid, configSid);
         return new ResultBean<AppModelVeDetailVo>().success().setData(vo);
     }
 }

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<BaseVehmodelCo
         String modelSid = dto.getModelSid();
         String configurationItemsSid = dto.getConfigurationItemsSid();
         BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
-        if (vo != null){
+        if (vo != null) {
             return rb.setMsg("当前常用配置信息已关联当前车型，请重新选择");
         }
         BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
         String sid = baseVehmodelConfig.getSid();
-        BeanUtil.copyProperties(dto,baseVehmodelConfig);
+        BeanUtil.copyProperties(dto, baseVehmodelConfig);
         baseVehmodelConfig.setSid(sid);
         save(baseVehmodelConfig);
         return rb.success().setMsg("关联成功");
@@ -361,7 +357,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     public ResultBean checkRelieve(String modelSid, String configurationItemsSid) {
         ResultBean rb = ResultBean.fireFail();
         BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
-        if (vo == null){
+        if (vo == null) {
             return rb.setMsg("当前常用配置信息未关联当前车型，请重新选择");
         }
         String sid = vo.getSid();
@@ -371,7 +367,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
 
     public AppModelVeDetailVo getAppIntentionVehicleVo(String userSid, String modelSid, String configSid) {
         String useOrg = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-        AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg,modelSid,configSid);
+        AppModelVeDetailVo vo = baseMapper.getAppIntentionVehicleVo(useOrg, modelSid, configSid);
         return vo;
     }
 
@@ -382,4 +378,10 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
     public BaseVehmodelConfigVo fetchAllBySid(String sid) {
         return baseMapper.fetchAllBySid(sid);
     }
+
+    public ResultBean<BaseVehmodelVo> selectOne(String modelSid, String configSid) {
+        ResultBean<BaseVehmodelVo> rb = ResultBean.fireFail();
+        BaseVehmodelVo vo = baseMapper.selectO(modelSid, configSid);
+        return rb.success().setData(vo);
+    }
 }

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

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<CrmVehicledemand
         IPage<CrmVehicledemand> page = PagerUtil.queryToPage(pcCrmVehicleDemandQuery);
         IPage<PcCrmVehicleDemandVo> pagging = baseMapper.selectPagePc(page, qw);
         PagerVo<PcCrmVehicleDemandVo> p = PagerUtil.pageToVo(pagging, null);
+        List<PcCrmVehicleDemandVo> list = p.getRecords();
+        if (list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                //根据车型sid及配置sid查询单台指导价
+                ResultBean<BaseVehmodelVo> voResultBean = baseVehmodelConfigFeign.selectOne(list.get(i).getModelSid(), list.get(i).getModelConfigSid());
+                if (voResultBean.getSuccess()) {
+                    list.get(i).setGuidedPrice(voResultBean.getData().getGuidedPrice());
+                }
+            }
+        }
         return p;
     }