|
|
@ -39,7 +39,8 @@ import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePolicyFeign; |
|
|
|
import com.yxt.anrui.base.api.basevehiclepolicy.BaseVehiclePriceVo; |
|
|
|
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.AppOrderReadyCar; |
|
|
|
import com.yxt.anrui.base.api.busvehicleapplydetail.AppBusVehicleApplyListVo; |
|
|
|
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderFeign; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderVo; |
|
|
|
import com.yxt.anrui.base.api.commoncontract.CommonContractBuscenterVo; |
|
|
@ -175,6 +176,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private CrmCustomerTempFeign crmCustomerTempFeign; |
|
|
|
@Autowired |
|
|
|
private BusVehicleApplyDetailFeign busVehicleApplyDetailFeign; |
|
|
|
|
|
|
|
/** |
|
|
|
* 构造查询条件 |
|
|
@ -1315,7 +1318,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
orderInfo.setReadyCarList(appReadyCarList); |
|
|
|
vo.setOrderInfo(orderInfo); |
|
|
|
AppCarInfo carInfo = new AppCarInfo(); |
|
|
|
List<AppReadyCar> readyCars = new ArrayList<>(); |
|
|
|
List<AppReadyCarVo> readyCars = new ArrayList<>(); |
|
|
|
carInfo.setReadyCar(readyCars); |
|
|
|
List<AppNowCarVo> nowCars = new ArrayList<>(); |
|
|
|
carInfo.setNowCar(nowCars); |
|
|
@ -1336,7 +1339,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
AppCarInfo appCarInfo = new AppCarInfo(); |
|
|
|
//根据车型及配置查询除的现车列表
|
|
|
|
List<AppNowCarVo> appNowCars = new ArrayList<>(); |
|
|
|
List<AppReadyCar> appReadyCar = new ArrayList<>(); |
|
|
|
List<AppReadyCarVo> appReadyCar = new ArrayList<>(); |
|
|
|
List<AppNowCarList> appNowCarLists = new ArrayList<>(); |
|
|
|
List<AppReadyCarList> appReadyCarLists = new ArrayList<>(); |
|
|
|
//根据车型及配置查询车型信息
|
|
|
@ -1363,11 +1366,24 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper |
|
|
|
appCarInfo.setNowCar(appNowCars); |
|
|
|
} |
|
|
|
//排产采购订单
|
|
|
|
List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData(); |
|
|
|
ResultBean<List<AppBusVehicleApplyListVo>> applyListResultBean = busVehicleApplyDetailFeign.getAppApplyList(modelSid,configSid); |
|
|
|
if(applyListResultBean.getSuccess()){ |
|
|
|
List<AppBusVehicleApplyListVo> applyListVos = applyListResultBean.getData(); |
|
|
|
for (AppBusVehicleApplyListVo applyListVo : applyListVos){ |
|
|
|
AppReadyCarVo appReadyCarVo = new AppReadyCarVo(); |
|
|
|
BeanUtil.copyProperties(applyListVo,appReadyCarVo); |
|
|
|
appReadyCar.add(appReadyCarVo); |
|
|
|
} |
|
|
|
appCarInfo.setReadyCar(appReadyCar); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
vo.setCarInfo(appCarInfo); |
|
|
|
/*List<AppOrderReadyCar> appOrderReadyCars = busVehicleOrderFeign.getAppReadyCar(modelSid, configSid).getData(); |
|
|
|
//排产
|
|
|
|
BeanUtil.copyProperties(appReadyCar, appOrderReadyCars); |
|
|
|
vo.setCarInfo(appCarInfo); |
|
|
|
appCarInfo.setReadyCar(appReadyCar); |
|
|
|
appCarInfo.setReadyCar(appReadyCar);*/ |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|