yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

注释报错

master
dimengzhe 3 years ago
parent
d20fd3cbfd
commit
d84b11e0d9
1 changed files with 13 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java

30
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java
View File

@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigFeign;
import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigSelectVo;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelSelectVo;
import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleVo;
import com.yxt.anrui.buscenter.api.busorder.BusOrder; import com.yxt.anrui.buscenter.api.busorder.BusOrder;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel;
import com.yxt.anrui.buscenter.api.busordervehicle.*; import com.yxt.anrui.buscenter.api.busordervehicle.*;
@ -181,15 +178,15 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
} }
} else { // 查询 } else { // 查询
BusOrderModel busOrderModel = busOrderModelService.fetchModByOrderSid(orderSid); BusOrderModel busOrderModel = busOrderModelService.fetchModByOrderSid(orderSid);
BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(busOrderModel.getVehicleSid()).getData(); // BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(busOrderModel.getVehicleSid()).getData();
BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(busOrderModel.getModelConfigSid()).getData(); BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(busOrderModel.getModelConfigSid()).getData();
for (BusOrderVehicleVo vehicleVo : vehicleVoList) { for (BusOrderVehicleVo vehicleVo : vehicleVoList) {
AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo(); AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo();
BeanUtil.copyProperties(vehicleVo, vo); BeanUtil.copyProperties(vehicleVo, vo);
vo.setGearboxType(modelVo.getGearboxTypeValue()); // vo.setGearboxType(modelVo.getGearboxTypeValue());
vo.setEmissionStandard(modelVo.getEmissionStandardValue()); // vo.setEmissionStandard(modelVo.getEmissionStandardValue());
vo.setDriveForm(modelVo.getDriveFormValue()); // vo.setDriveForm(modelVo.getDriveFormValue());
vo.setPower(modelVo.getPowerValue()); // vo.setPower(modelVo.getPowerValue());
vo.setSpecification(configVo.getSpecification()); vo.setSpecification(configVo.getSpecification());
vo.setFuelTank(configVo.getFuelTank()); vo.setFuelTank(configVo.getFuelTank());
list.add(vo); list.add(vo);
@ -218,9 +215,8 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
String vehicleSid = busOrderModel.getVehicleSid(); String vehicleSid = busOrderModel.getVehicleSid();
String modelConfigSid = busOrderModel.getModelConfigSid(); String modelConfigSid = busOrderModel.getModelConfigSid();
String quantity = busOrderModel.getQuantity(); String quantity = busOrderModel.getQuantity();
BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(vehicleSid).getData(); // BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(vehicleSid).getData();
BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(modelConfigSid).getData(); BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(modelConfigSid).getData();
// BaseVehicleSelectVo vehicleVo = baseVehicleFeign.details(modelConfigSid).getData();
List<AppBusOrderVehicleVo> list = new ArrayList<>(); List<AppBusOrderVehicleVo> list = new ArrayList<>();
// 单车返利 // 单车返利
double singleFL = 0; double singleFL = 0;
@ -233,10 +229,10 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo(); AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo();
vo.setSid(UUID.randomUUID().toString()); vo.setSid(UUID.randomUUID().toString());
vo.setVehicleCode(configVo.getVehicleCode()); vo.setVehicleCode(configVo.getVehicleCode());
vo.setGearboxType(modelVo.getGearboxTypeValue()); // vo.setGearboxType(modelVo.getGearboxTypeValue());
vo.setEmissionStandard(modelVo.getEmissionStandardValue()); // vo.setEmissionStandard(modelVo.getEmissionStandardValue());
vo.setDriveForm(modelVo.getDriveFormValue()); // vo.setDriveForm(modelVo.getDriveFormValue());
vo.setPower(modelVo.getPowerValue()); // vo.setPower(modelVo.getPowerValue());
vo.setVehicleColor(configVo.getCarColor()); vo.setVehicleColor(configVo.getCarColor());
vo.setSpecification(configVo.getSpecification()); vo.setSpecification(configVo.getSpecification());
vo.setFuelTank(configVo.getFuelTank()); vo.setFuelTank(configVo.getFuelTank());
@ -264,13 +260,13 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo(); AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo();
BusOrderVehicle vehicle = fetchBySid(sid); BusOrderVehicle vehicle = fetchBySid(sid);
BeanUtil.copyProperties(vehicle, vo); BeanUtil.copyProperties(vehicle, vo);
BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(vehicle.getOrdrerModelSid()).getData(); // BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(vehicle.getOrdrerModelSid()).getData();
BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(vehicle.getModelConfigSid()).getData(); BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(vehicle.getModelConfigSid()).getData();
vo.setGearboxType(modelVo.getGearboxTypeValue()); /* vo.setGearboxType(modelVo.getGearboxTypeValue());
vo.setGearboxType(modelVo.getGearboxTypeValue()); vo.setGearboxType(modelVo.getGearboxTypeValue());
vo.setEmissionStandard(modelVo.getEmissionStandardValue()); vo.setEmissionStandard(modelVo.getEmissionStandardValue());
vo.setDriveForm(modelVo.getDriveFormValue()); vo.setDriveForm(modelVo.getDriveFormValue());
vo.setPower(modelVo.getPowerValue()); vo.setPower(modelVo.getPowerValue());*/
vo.setVehicleCode(configVo.getVehicleCode()); vo.setVehicleCode(configVo.getVehicleCode());
vo.setVehicleColor(configVo.getCarColor()); vo.setVehicleColor(configVo.getCarColor());
vo.setSpecification(configVo.getSpecification()); vo.setSpecification(configVo.getSpecification());

Write Preview
Loading…
Cancel
Save