From d84b11e0d9ec5832c38da61dc6aceef97e978c92 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Mon, 13 Jun 2022 09:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusOrderVehicleService.java               | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java
index 32b92233b5..ba9efad217 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java
@@ -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.BaseModelConfigSelectVo;
 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.BaseVehicleModelSelectVo;
-import com.yxt.anrui.buscenter.api.busginvoiceapplyvehicle.BusGinvoiceapplyVehicleVo;
 import com.yxt.anrui.buscenter.api.busorder.BusOrder;
 import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel;
 import com.yxt.anrui.buscenter.api.busordervehicle.*;
@@ -181,15 +178,15 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
             }
         } else { // 查询
             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();
             for (BusOrderVehicleVo vehicleVo : vehicleVoList) {
                 AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo();
                 BeanUtil.copyProperties(vehicleVo, vo);
-                vo.setGearboxType(modelVo.getGearboxTypeValue());
-                vo.setEmissionStandard(modelVo.getEmissionStandardValue());
-                vo.setDriveForm(modelVo.getDriveFormValue());
-                vo.setPower(modelVo.getPowerValue());
+//                vo.setGearboxType(modelVo.getGearboxTypeValue());
+//                vo.setEmissionStandard(modelVo.getEmissionStandardValue());
+//                vo.setDriveForm(modelVo.getDriveFormValue());
+//                vo.setPower(modelVo.getPowerValue());
                 vo.setSpecification(configVo.getSpecification());
                 vo.setFuelTank(configVo.getFuelTank());
                 list.add(vo);
@@ -218,9 +215,8 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
         String vehicleSid = busOrderModel.getVehicleSid();
         String modelConfigSid = busOrderModel.getModelConfigSid();
         String quantity = busOrderModel.getQuantity();
-        BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(vehicleSid).getData();
+//        BaseVehicleModelDetailsVo modelVo = baseVehicleModelFeign.details(vehicleSid).getData();
         BaseModelConfigSelectVo configVo = baseModelConfigFeign.details(modelConfigSid).getData();
-//        BaseVehicleSelectVo vehicleVo = baseVehicleFeign.details(modelConfigSid).getData();
         List<AppBusOrderVehicleVo> list = new ArrayList<>();
         // 单车返利
         double singleFL = 0;
@@ -233,10 +229,10 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
             AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo();
             vo.setSid(UUID.randomUUID().toString());
             vo.setVehicleCode(configVo.getVehicleCode());
-            vo.setGearboxType(modelVo.getGearboxTypeValue());
-            vo.setEmissionStandard(modelVo.getEmissionStandardValue());
-            vo.setDriveForm(modelVo.getDriveFormValue());
-            vo.setPower(modelVo.getPowerValue());
+//            vo.setGearboxType(modelVo.getGearboxTypeValue());
+//            vo.setEmissionStandard(modelVo.getEmissionStandardValue());
+//            vo.setDriveForm(modelVo.getDriveFormValue());
+//            vo.setPower(modelVo.getPowerValue());
             vo.setVehicleColor(configVo.getCarColor());
             vo.setSpecification(configVo.getSpecification());
             vo.setFuelTank(configVo.getFuelTank());
@@ -264,13 +260,13 @@ public class BusOrderVehicleService extends MybatisBaseService<BusOrderVehicleMa
         AppBusOrderVehicleVo vo = new AppBusOrderVehicleVo();
         BusOrderVehicle vehicle = fetchBySid(sid);
         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();
-        vo.setGearboxType(modelVo.getGearboxTypeValue());
+       /* vo.setGearboxType(modelVo.getGearboxTypeValue());
         vo.setGearboxType(modelVo.getGearboxTypeValue());
         vo.setEmissionStandard(modelVo.getEmissionStandardValue());
         vo.setDriveForm(modelVo.getDriveFormValue());
-        vo.setPower(modelVo.getPowerValue());
+        vo.setPower(modelVo.getPowerValue());*/
         vo.setVehicleCode(configVo.getVehicleCode());
         vo.setVehicleColor(configVo.getCarColor());
         vo.setSpecification(configVo.getSpecification());