Browse Source

移动端-虚拟订单选择车型及获取车架号修改

master
dimengzhe 3 years ago
parent
commit
099df9c1cc
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  3. 25
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java
  4. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  5. 90
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  6. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  7. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  8. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java
  9. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java
  10. 4
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java
  11. 13
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@ -228,8 +228,8 @@ public interface BaseVehicleFeign {
public ResultBean<AppCurrentCarDetailVo> getAppCurrentCarDetailVo(@PathVariable("modelSid") String modelSid);
@ApiOperation("获取车架号")
@GetMapping("/getVins/{modelSid}/{configSid}")
public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
@GetMapping("/getVins/{modelSid}/{configSid}/{userSid}")
public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable("userSid") String userSid);
@ApiOperation("手机端业务-车型报价-列表(新)")
@PostMapping("/getModelList")

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@ -152,7 +152,7 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
}
@Override
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid) {
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
return null;
}

25
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@ -555,22 +555,21 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
}
public AppModelConfigVo getNowConfigList(PagerQuery<AppModelConfigListQuery> pagerQuery) {
String userSid = pagerQuery.getParams().getUserSid();
// 1、根据业务员部门sid查询分公司 查询orgSidPath(部门路径)
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
/*SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
if (data != null) {
// 2) 根据orgSidPath(部门路径)判断分公司sid
pagerQuery.getParams().setUseOrg(data.getSid());
}*/
String modelSid = pagerQuery.getParams().getModelSid();
// String useOrgSid = data.getSid();
AppModelConfigVo vo = baseMapper.getModelConfigList(modelSid, orgSid);
String type = "0002";
String path = fileUploadComponent.getUrlPrefix();
List<String> modelImages = baseVehicleAppendixService.selectBySid(type, modelSid, path);
vo.setModelImage(modelImages);
List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
List<String> modelImagesList = new ArrayList<>();
if (!modelImages.isEmpty()) {
for (int i = 0; i < modelImages.size(); i++) {
if (!modelImages.get(i).contains(fileUploadComponent.getUrlPrefix())) {
modelImagesList.add(fileUploadComponent.getUrlPrefix() + modelImages.get(i));
}
}
}
vo.setModelImage(modelImagesList);
//基础配置拼接
List<ConfigInfo> list = new ArrayList<>();
@ -597,7 +596,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
long pages = page.getPages();
vo.setPages((int) pages);
//分公司配置列表查询
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
/* for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
if (StringUtils.isBlank(appModelConfigListVo.getProduceCarNum())) {
appModelConfigListVo.setProduceCarNum("0");
}
@ -608,7 +607,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
moreConfigVo.setCompanyName(sysOrganizationVo.getName());
}
appModelConfigListVo.setMoreList(moreConfigVos);
}
}*/
addDonfigName(appModelConfigListVos);
vo.setModelConfigList(appModelConfigListVos);
return vo;

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@ -205,7 +205,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
* @param configSid
* @return
*/
List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("state")String state);
List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid,@Param("state")String state,@Param("orgSid")String orgSid);
/**
* 现车分页列表

90
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -441,6 +441,7 @@
WHERE bv.modelSid = #{modelSid}
AND bv.modelConfigSid = #{configSid}
AND bv.lockedState = #{state}
and bv.useOrg = #{orgSid}
</select>
<select id="selExistingCarPageList"
@ -661,21 +662,21 @@
<!--根据车架号查询现车详情-->
<select id="getPurchaseDetails" resultType="com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo">
select bv.sid,
bv.vinNo,
bv.vehicleStateValue,
bv.location,
bv.priceDate,
bv.guidedPrice
bv.vinNo,
bv.vehicleStateValue,
bv.location,
bv.priceDate,
bv.guidedPrice
from base_vehicle bv
where bv.vinNo = #{vinNo}
</select>
<select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
select bv.vinNo linkNo,
bv.location linkText,
bv.sid linkSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
select bv.vinNo linkNo,
bv.location linkText,
bv.sid linkSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
from base_vehicle bv
<where>
${ew.sqlSegment}
@ -689,70 +690,70 @@
</select>
<select id="getModelNowCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseVinNowCarVo">
SELECT vinNo AS vin,
vehicleStateValue AS `state`,
carColor AS color,
locationName AS address
SELECT vinNo AS vin,
vehicleStateValue AS `state`,
carColor AS color,
locationName AS address
FROM base_vehicle bv
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
${ew.customSqlSegment}
LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
${ew.customSqlSegment}
</select>
<select id="selectVehicleCount" resultType="java.lang.Integer">
select count(*)
from base_vehicle bv
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectByModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigNowCarVo">
SELECT bvm.vehicleAlias AS modelName,
bc.guidedPrice AS price,
bmc.configName AS commonlyConfig
bc.guidedPrice AS price,
bmc.configName AS commonlyConfig
FROM base_vehmodel_config bc
LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
LEFT JOIN base_vehicle_model bvm ON bc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc ON bc.configurationItemsSid = bmc.`sid`
where bc.modelSid = #{modelSid}
AND bc.configurationItemsSid = #{configSid}
AND bc.useOrgSid = #{useOrg}
AND bc.configurationItemsSid = #{configSid}
AND bc.useOrgSid = #{useOrg}
</select>
<select id="getModelSidAndConfigSid"
resultType="com.yxt.anrui.base.api.basevehicle.AppBaseConfigOrderCarVo">
select bvm.vehicleAlias AS modelName,
bvc.guidedPrice AS price,
bmc.configName AS commonlyConfig
bvc.guidedPrice AS price,
bmc.configName AS commonlyConfig
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.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
</select>
<select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
SELECT bvo.orderNo AS orderId,
bvo.orderStatus AS state,
bvo.orderDate AS `date`,
bvo.expectLaunchDate AS forecastDate,
bvo.launchDate AS `upDate`,
bvo.offlineDate AS downDate,
bvad.quantity as `number`
SELECT bvo.orderNo AS orderId,
bvo.orderStatus AS state,
bvo.orderDate AS `date`,
bvo.expectLaunchDate AS forecastDate,
bvo.launchDate AS `upDate`,
bvo.offlineDate AS downDate,
bvad.quantity as `number`
FROM bus_vehicle_order bvo
left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="selectAppList" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
select bv.vinNo vin,
bv.locationName address,
bv.sid carSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
select bv.vinNo vin,
bv.locationName address,
bv.sid carSid,
if(bv.lockedState = 1, 1, 0)
as isFictitious
from base_vehicle bv
where bv.modelSid = #{modelSid}
and bv.modelConfigSid = #{configSid}
and bv.modelConfigSid = #{configSid}
order by isFictitious desc
</select>
@ -760,7 +761,8 @@
select filePath
from base_vehicle_appendix
where linkSid = #{vehicleSid}
and attachType = '0001' limit 1
and attachType = '0001'
limit 1
</select>
<select id="getVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@ -128,7 +128,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
if (count > 0) {
return rb.setMsg("已存在该车架号的车辆信息");
}
BeanUtil.copyProperties(dto,baseVehicle);
BeanUtil.copyProperties(dto, baseVehicle);
//锁定状态
String lockedStateKey = VehicleState.LockEnum.UN_LOCK.getCode();
String lockedStateValue = VehicleState.LockEnum.UN_LOCK.getRemarks();
@ -393,8 +393,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
* @return
*/
@Override
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid) {
List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid);
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
List<AppVinsDetailsVo> vo = baseVehicleService.getVins(modelSid, configSid, userSid);
return new ResultBean<List<AppVinsDetailsVo>>().success().setData(vo);
}

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@ -627,8 +627,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
* @param configSid
* @return
*/
public List<AppVinsDetailsVo> getVins(String modelSid, String configSid) {
List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid,VehicleState.LockEnum.UN_LOCK.getCode());
public List<AppVinsDetailsVo> getVins(String modelSid, String configSid,String userSid) {
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
List<AppVinsDetailsVo> vins = baseMapper.getVins(modelSid, configSid,VehicleState.LockEnum.UN_LOCK.getCode(),orgSid);
if (vins.size() <= 0) {
for (AppVinsDetailsVo vin : vins) {
vins.add(vin);

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java

@ -1,6 +1,5 @@
package com.yxt.anrui.terminal.api.autoservice.virtualOrders;
import com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
@ -12,7 +11,6 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -133,8 +131,8 @@ public interface AppBusMainDepositFeign {
public ResultBean<AppBusDepositVehicleDetailVo> getReserveCarDetails(@PathVariable("virtualOrderSid") String virtualOrderSid);
@ApiOperation("获取车架号")
@GetMapping("/getVins/{modelSid}/{configSid}")
public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid);
@GetMapping("/getVins/{modelSid}/{configSid}/{userSid}")
public ResultBean<List<AppVinsDetailsVo>> getVins(@PathVariable("modelSid") String modelSid, @PathVariable("configSid") String configSid, @PathVariable(value = "userSid") String userSid);
@ApiOperation("订金使用记录接口")
@GetMapping("/getDepositRecords/{depositBillNo}")

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeignFallback.java

@ -36,9 +36,6 @@ import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositFlowTask;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery;
import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -161,7 +158,7 @@ public class AppBusMainDepositFeignFallback implements AppBusMainDepositFeign {
}
@Override
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid) {
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid, String userSid) {
return null;
}

4
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositRest.java

@ -200,8 +200,8 @@ public class AppBusMainDepositRest implements AppBusMainDepositFeign {
* @return
*/
@Override
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid) {
return appBusMainDepositService.getVins(modelSid, configSid);
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid,String userSid) {
return appBusMainDepositService.getVins(modelSid, configSid,userSid);
}
/**

13
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@ -30,17 +30,16 @@ import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo;
import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.buscenter.api.busdeposit.*;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.*;
import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppBusMainDepositPageQuery;
import com.yxt.anrui.terminal.api.autoservice.virtualOrders.AppWarehouseVinVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehicleexamine.AppExamineDetailsVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
@ -183,8 +182,8 @@ public class AppBusMainDepositService {
* @param configSid
* @return
*/
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid) {
ResultBean<List<AppVinsDetailsVo>> vins = baseVehicleFeign.getVins(modelSid, configSid);
public ResultBean<List<AppVinsDetailsVo>> getVins(String modelSid, String configSid,String userSid) {
ResultBean<List<AppVinsDetailsVo>> vins = baseVehicleFeign.getVins(modelSid, configSid,userSid);
return vins;
}

Loading…
Cancel
Save