车型报价价格有效期询价接口，修改虚拟订单接口bug

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

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

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

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

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">

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

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

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,