From 059149e9abd42bf0629833c97692fe41234aa111 Mon Sep 17 00:00:00 2001
From: hanlinghao <2969694837@qq.com>
Date: Tue, 31 May 2022 08:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E6=8A=A5=E4=BB=B7=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC=E6=9C=89=E6=95=88=E6=9C=9F=E8=AF=A2=E4=BB=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/basevehicle/BaseVehicleFeign.java     |  4 +++
 .../basevehicle/BaseVehicleFeignFallback.java |  5 +++
 .../base/biz/basevehicle/BaseVehicleRest.java |  7 ++++
 .../BaseVehmodelConfigMapper.java             |  2 +-
 .../BaseVehmodelConfigMapper.xml              |  2 +-
 .../BaseVehmodelConfigService.java            |  7 ++--
 .../BusVehicleInquiryService.java             | 32 +++++++++++++++++++
 .../busmaindeposit/BusMainDepositMapper.xml   |  1 -
 8 files changed, 52 insertions(+), 8 deletions(-)

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 e486d54736..0697d8e7ec 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
@@ -254,4 +254,8 @@ public interface BaseVehicleFeign {
     @ApiOperation("手机端-保存 询价 其他配置说明")
     @PostMapping("/saveCarConfigSummaryInfo")
     public ResultBean saveCarConfigSummaryInfo(@Valid @RequestBody AppCarConfigSummaryDto dto);
+
+    @ApiOperation("手机端-价格有效期询价")
+    @PostMapping("/inquiryPrice")
+    public ResultBean inquiryPrice(@Valid @RequestBody AppCarConfigSummaryDto dto);
 }
\ No newline at end of file
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 65f9d2dbcb..c679c0592a 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
@@ -186,4 +186,9 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean inquiryPrice(AppCarConfigSummaryDto dto) {
+        return null;
+    }
+
 }
\ 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 6c4720b1d8..1e7f6c4d91 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
@@ -571,5 +571,12 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success();
     }
 
+    @Override
+    public ResultBean inquiryPrice(AppCarConfigSummaryDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        busVehicleInquiryService.inquiryPrice(dto);
+        return rb.success();
+    }
+
 
 }
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 ba95dc4bff..23f93a1b4d 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
@@ -119,7 +119,7 @@ public interface BaseVehmodelConfigMapper extends BaseMapper<BaseVehmodelConfig>
 
     BaseVehmodelVo selectO(@Param("modelSid") String modelSid, @Param("configSid") String configSid);
 
-    AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid);
+    AppModelConfigListVo selectCarConfigSummary(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid);
 
     List<BaseVehmodelConfigVo> getListByConfigSid(String sid);
 
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 7754bad3cd..603be2eebe 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
@@ -250,7 +250,7 @@
                  LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
-          AND bvc.useOrgSid = #{orgSid}
+          AND bvc.useOrgSid = #{useOrgSid}
     </select>
 
     <select id="getListByConfigSid" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
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 442fbdec14..5a8ca52e07 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
@@ -473,11 +473,8 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
 
     public ResultBean<AppCarConfigSummaryVo> selectCarConfigSummary(String modelSid, String configSid, String userSid) {
         ResultBean<AppCarConfigSummaryVo> rb = ResultBean.fireFail();
-        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
-        if (!resultBean.getSuccess()) {
-            return rb.setData(new AppCarConfigSummaryVo());
-        }
-        AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, resultBean.getData());
+        String useOrgSid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        AppModelConfigListVo appModelConfigListVo = baseMapper.selectCarConfigSummary(modelSid, configSid, useOrgSid);
         if (appModelConfigListVo != null) {
             AppCarConfigSummaryVo configSummaryVo = addConfigName(appModelConfigListVo);
             return rb.success().setData(configSummaryVo);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
index e15057e90a..317b071a84 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
@@ -28,9 +28,11 @@ package com.yxt.anrui.base.biz.busvehicleinquiry;
 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.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehicle.AppCarConfigSummaryDto;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.busvehicleinquiry.*;
+import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -72,6 +74,9 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
     @Autowired
     BaseVehicleModelService baseVehicleModelService;
 
+    @Autowired
+    BaseModelConfigService baseModelConfigService;
+
     public PagerVo<BusVehicleInquiry> listPage(PagerQuery<BusVehicleInquiryQuery> pq) {
         BusVehicleInquiryQuery query = pq.getParams();
         QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
@@ -179,4 +184,31 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
         busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName());
         save(busVehicleInquiry);
     }
+
+    /**
+     * 车型报价点击询价保存询价数据
+     *
+     * @param dto
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void inquiryPrice(AppCarConfigSummaryDto dto) {
+        BusVehicleInquiry busVehicleInquiry = new BusVehicleInquiry();
+        busVehicleInquiry.setModelSid(dto.getModelSid());
+        busVehicleInquiry.setConfigSid(dto.getConfigSid());
+        BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(dto.getModelSid());
+        busVehicleInquiry.setModelName(baseVehicleModel.getModelName());
+        busVehicleInquiry.setBrandSid(baseVehicleModel.getCarBrand());
+        busVehicleInquiry.setBrandName(baseVehicleModel.getBrandName());
+        BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(dto.getConfigSid());
+        busVehicleInquiry.setModelBriefConfiguration(baseModelConfig.getConfigName());
+        String userSid = dto.getUserSid();
+        AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
+        busVehicleInquiry.setInquirer(data.getStaffName());
+        busVehicleInquiry.setCreateOrgSid(data.getOrgSid());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String format = simpleDateFormat.format(new Date());
+        busVehicleInquiry.setInquiryDate(format);
+        save(busVehicleInquiry);
+    }
+
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
index 7d5f4df158..964401794a 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml
@@ -51,7 +51,6 @@
                 and bmd.billNo LIKE concat('%', #{name}, '%')
             </if>
         </where>
-        ORDER BY bmd.createTime desc
         <if test="name != '' and name != null ">
             UNION ALL
             SELECT bmd.sid AS virtualOrderSid,