|
|
|
@ -39,12 +39,16 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleQKKPVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; |
|
|
|
import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; |
|
|
|
import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.ContractPageVo; |
|
|
|
import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; |
|
|
|
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AdCarListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply; |
|
|
|
import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.GCarListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesorder.app.vin.VinListsVo; |
|
|
|
import com.yxt.anrui.buscenter.api.bussalesordervehicle.*; |
|
|
|
@ -90,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderService busSalesOrderService; |
|
|
|
@Autowired |
|
|
|
private BusSalesOrderVehicleService busSalesOrderVehicleService; |
|
|
|
@Autowired |
|
|
|
private BaseTrailerFeign baseTrailerFeign; |
|
|
|
@Autowired |
|
|
|
private FinSelectedReceivablesDetailedFeign finSelectedReceivablesDetailedFeign; |
|
|
|
@ -105,6 +111,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
private BaseVehicleAppendixFeign baseVehicleAppendixFeign; |
|
|
|
@Autowired |
|
|
|
private BusArrearsCarryVehicleApplyService busArrearsCarryVehicleApplyService; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleStateFeign baseVehicleStateFeign; |
|
|
|
|
|
|
|
public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) { |
|
|
|
if (list.size() > 0) { |
|
|
|
@ -303,49 +311,48 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
} |
|
|
|
List<BusVehicleQKKPVo> busVehicleQKKPVos = baseMapper.appVehicleQKKPList(qw); |
|
|
|
List<BusVehicleQKKPTrailerVo> busVehicleQKKPTrailerVos = new ArrayList<>(); |
|
|
|
List<BusVehicleQKKPVo> busVehicleQKKPVosNew1 = new ArrayList<>(); |
|
|
|
List<BusVehicleQKKPVo> busVehicleQKKPVosNew = new ArrayList<>(); |
|
|
|
if (busVehicleQKKPVos != null) { |
|
|
|
if (busVehicleQKKPVos != null && busVehicleQKKPVos.size() > 0) { |
|
|
|
for (BusVehicleQKKPVo record : busVehicleQKKPVos) { |
|
|
|
//判断相同车辆是否存在已提交的申请
|
|
|
|
FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); |
|
|
|
if (finBillVehicleDetailsVo == null) { |
|
|
|
busVehicleQKKPVosNew1.add(record); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew1) { |
|
|
|
String vehSid = busVehicleQKKPVo.getVehSid(); |
|
|
|
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData(); |
|
|
|
if (busArrearsCarryVehicleApply == null){ |
|
|
|
busVehicleQKKPVosNew.add(busVehicleQKKPVo); |
|
|
|
} |
|
|
|
} |
|
|
|
for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew) { |
|
|
|
if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) { |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData(); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); |
|
|
|
busVehicleQKKPVo.setZcHgzImages(stringList); |
|
|
|
if (finBillVehicleDetailsVo != null) { |
|
|
|
busVehicleQKKPVos.remove(record); |
|
|
|
if (busVehicleQKKPVos.size() == 0){ |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData(); |
|
|
|
List<TrailerVo> trailerVos = traliveredVo.getList(); |
|
|
|
if (trailerVos != null && trailerVos.size() > 0) { |
|
|
|
for (TrailerVo trailerVo : trailerVos) { |
|
|
|
BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo(); |
|
|
|
busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo()); |
|
|
|
busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); |
|
|
|
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData(); |
|
|
|
busVehicleQKKPTrailerVo.setOneBillMoney(baseTrailerDetailsVo.getDealPrice()); |
|
|
|
busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo); |
|
|
|
busVehicleQKKPVo.setTrailers(busVehicleQKKPTrailerVos); |
|
|
|
String vehSid = record.getVehSid(); |
|
|
|
if (StringUtils.isNotBlank(vehSid)){ |
|
|
|
BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = busArrearsCarryVehicleApplyService.selSubmitLc(vehSid).getData(); |
|
|
|
if (busArrearsCarryVehicleApply != null){ |
|
|
|
busVehicleQKKPVos.remove(record); |
|
|
|
if (busVehicleQKKPVos.size() == 0){ |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(vehSid).getData(); |
|
|
|
if (baseVehicleCertificateVo != null) { |
|
|
|
record.setCertificateState(baseVehicleCertificateVo.getCertificateState()); |
|
|
|
record.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); |
|
|
|
List<String> stringList = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); |
|
|
|
record.setZcHgzImages(stringList); |
|
|
|
} |
|
|
|
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(vehSid, query.getContractNo()).getData(); |
|
|
|
List<TrailerVo> trailerVos = traliveredVo.getList(); |
|
|
|
if (trailerVos != null && trailerVos.size() > 0) { |
|
|
|
for (TrailerVo trailerVo : trailerVos) { |
|
|
|
BusVehicleQKKPTrailerVo busVehicleQKKPTrailerVo = new BusVehicleQKKPTrailerVo(); |
|
|
|
busVehicleQKKPTrailerVo.setVinNo(traliveredVo.getVinNo()); |
|
|
|
busVehicleQKKPTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo()); |
|
|
|
busVehicleQKKPTrailerVo.setOneBillMoney(trailerVo.getDealPrice()); |
|
|
|
busVehicleQKKPTrailerVos.add(busVehicleQKKPTrailerVo); |
|
|
|
record.setTrailers(busVehicleQKKPTrailerVos); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setData(busVehicleQKKPVosNew); |
|
|
|
return rb.success().setData(busVehicleQKKPVos); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<List<QCarVo>> getCanUseCars(QCarQuery query) { |
|
|
|
@ -510,4 +517,20 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde |
|
|
|
|
|
|
|
return baseMapper.selectOneByVehSidAndOrderSid(vehSid,orderSid); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean<Boolean> appVehicleQKKPList2(String contractNo) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
Boolean i = false; |
|
|
|
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(contractNo); |
|
|
|
List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(busSalesOrder.getSid()); |
|
|
|
for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) { |
|
|
|
String sid = busSalesOrderVehicle.getSid(); |
|
|
|
BaseVehicleState baseVehicleState = baseVehicleStateFeign.selectOneQKKPByBusSid(sid).getData(); |
|
|
|
if (baseVehicleState != null){ |
|
|
|
i = true; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
return rb.success().setData(i); |
|
|
|
} |
|
|
|
} |
God
2 years ago