Merge branch 'master-order' into dev

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -15,13 +14,11 @@ import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.biz.inner.OrderCalculateBiz;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
-import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
+import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.add.BgAddRentDTO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
-import com.xxfc.platform.universal.constant.DictionaryKey;
-import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
@@ -37,14 +34,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
-
 @Controller
 @RequestMapping("orderRentVehicle")
 @Api(value="租车订单",tags={"租车订单"})
@@ -77,10 +70,11 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
-            RentVehicleBO bo = initRentVehicleBO(vo);
-            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
-            orderRentVehicleService.createOrder(bo);
-            return ObjectRestResponse.succ(bo.getOrder());
+//            RentVehicleBO bo = initRentVehicleBO(vo);
+//            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+//            orderRentVehicleService.createOrder(bo);
+//            return ObjectRestResponse.succ(bo.getOrder());
+                return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "系统正在维护阶段，请联系客服！");
         }
 
         @RequestMapping(value = "back-stage/add",method = RequestMethod.POST)