修改车辆代码

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java

@@ -347,10 +347,10 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
                 setType(crosstownTypeEnum);
             }});
 
-            VehicleItemDTO vehicleItemDTO = (VehicleItemDTO) orderItemBiz.selectOne(new OrderItem(){{
+            VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
                 setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
                 setOrderId(orderMQDTO.getId());
-            }});
+            }}), VehicleItemDTO.class);
 
             if(null == crosstown) {
                 throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet(StrUtil.format("退款第一部分押金失败，获取不了还车/定损记录，订单号：{}, crosstownTypeEnum: {}",  orderMQDTO.getId(), crosstownTypeEnum)));

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCalculateBiz.java

@@ -245,10 +245,10 @@ public class OrderCalculateBiz {
     }
 
     public InProgressVO inProgressCalculate(BaseOrder baseOrder, Integer useDays) {
-        VehicleItemDTO vehicleItemDTO = (VehicleItemDTO) orderItemBiz.selectOne(new OrderItem(){{
+        VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
             setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
             setOrderId(baseOrder.getId());
-        }});
+        }}), VehicleItemDTO.class);
         Integer freeDays = (null == vehicleItemDTO.getCutNum())?0 :vehicleItemDTO.getCutNum();
         return inProgressCalculate(baseOrder, vehicleItemDTO, freeDays, useDays, new OrderAccountDetail(), Boolean.FALSE);
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -139,10 +139,10 @@ public class OrderCancelBiz {
                         setOrderId(baseOrder.getId());
                     }});
 
-                    VehicleItemDTO vehicleItemDTO = (VehicleItemDTO) orderItemBiz.selectOne(new OrderItem(){{
+                    VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
                         setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
                         setOrderId(baseOrder.getId());
-                    }});
+                    }}), VehicleItemDTO.class);
 
                     //如果超过出发时间，不能取消订单
                     //根据时间处理goodsAmount

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderRefundController.java

 package com.xxfc.platform.order.rest;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
@@ -93,10 +94,10 @@ public class OrderRefundController extends BaseController<OrderRefundBiz,OrderRe
 
                 Long timeLag = orderPageVO.getOrderRentVehicleDetail().getStartTime() - System.currentTimeMillis();
 
-                VehicleItemDTO vehicleItemDTO = (VehicleItemDTO) orderItemBiz.selectOne(new OrderItem(){{
+                VehicleItemDTO vehicleItemDTO = BeanUtil.toBean(orderItemBiz.selectOne(new OrderItem(){{
                     setType(ItemTypeEnum.VEHICLE_MODEL.getCode());
                     setOrderId(orderPageVO.getId());
-                }});
+                }}), VehicleItemDTO.class);
 
                 if(timeLag < 0 ) {
                     OrderAccountDetail oad = new OrderAccountDetail();

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -242,7 +242,10 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
 
         //设置Item
-        VehicleItemDTO vehicleOrderItem = (VehicleItemDTO) orderItemBiz.initOrderItem(vehicleModel.getPrice(), detail.getDayNum(), vehicleModel.getName(), vehicleModel.getId(), ItemTypeEnum.VEHICLE_MODEL, JSONUtil.parseArray(vmcpds).toString());
+        VehicleItemDTO vehicleOrderItem = BeanUtil.toBean(
+                orderItemBiz.initOrderItem(vehicleModel.getPrice(), detail.getDayNum(), vehicleModel.getName()
+                        , vehicleModel.getId(), ItemTypeEnum.VEHICLE_MODEL, JSONUtil.parseArray(vmcpds).toString())
+                , VehicleItemDTO.class);
         OrderItem driverOrderItem = orderItemBiz.initOrderItem(DRIVER_PRICE, detail.getDayNum(), "平台司机", null, ItemTypeEnum.DRIVER);
         OrderItem damageSafeOrderItem = orderItemBiz.initOrderItem(DAMAGE_SAFE, detail.getDayNum(), "免赔费用", null, ItemTypeEnum.DAMAGE_SAFE);