修改订单相关

ace-common/src/main/java/com/github/wxiaoqi/security/common/exception/BaseException.java

@@ -47,7 +47,7 @@ public class BaseException extends RuntimeException {
     }
 
     public BaseException(int code) {
-        ResultCode.getMsg(code);
+        super(ResultCode.getMsg(code));
         this.status = code;
     }
 }

ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java

+package com.github.wxiaoqi.security.common.handler;
+
+
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+@RestControllerAdvice("com.xxfc.platform")
+public class PlatformExceptionHandler {
+
+    @ExceptionHandler(BaseException.class)
+    public BaseResponse baseExceptionHandler(BaseException e) {
+        return new BaseResponse(e.getStatus(), e.getMessage());
+    }
+
+}

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/vo/AddRentVehicleOrderVO.java

@@ -4,11 +4,18 @@ import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+
 @Data
 public class AddRentVehicleOrderVO extends OrderRentVehicleDetail {
     //主键
     @ApiModelProperty(hidden = true)
     private Integer id;
+    //基础订单id
+    @ApiModelProperty(hidden = true)
+    private Integer orderId;
 
-
+    //车辆id
+    @ApiModelProperty(hidden = true)
+    private Integer vehicleId;
 }

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

@@ -28,7 +28,7 @@ public class OrderRentVehicleController extends CommonBaseController {
         @ApiOperation(value = "确认租车订单")
         public ObjectRestResponse<OrderRentVehicleDetail> add(@RequestBody AddRentVehicleOrderVO vo){
             orderRentVehicleService.createOrder(vo);
-            return new ObjectRestResponse<OrderRentVehicleDetail>();
+            return new ObjectRestResponse<>();
         }
 
         @RequestMapping(value = "list-by-order/{orderId}",method = RequestMethod.GET)

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

@@ -20,7 +20,7 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
     @Autowired
     protected BaseOrderBiz baseOrderBiz;
 
-    protected OrderTypeEnum orderTypeEnum = null;
+    protected OrderTypeEnum orderTypeEnum;
 
     /**
      * 创建基础订单
@@ -45,14 +45,14 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
         BaseOrder order = createOrder();
         baseOrderBiz.insertSelective(order);
         createOrderMakeUp(order, detail);
-        handleItem(detail);
+        handleDetail(detail);
 }
 
     /**
      * 处理订单子项
      * @param detail
      */
-    public void handleItem(Detail detail){
+    public void handleDetail(Detail detail){
         detailBiz.insertSelective(detail);
     }
 
@@ -65,19 +65,23 @@ public abstract class AbstractOrderHandle<Biz extends BaseBiz, Detail extends Or
 //        for(Detail detail : details) {
 //            createOrderMakeUp(order, detail);
 //        }
-//        handleItem(details);
+//        handleDetail(details);
 //    }
 //
 //    /**
 //     * 处理订单多子项
 //     * @param details
 //     */
-//    public void handleItem(List<Detail> details){
+//    public void handleDetail(List<Detail> details){
 //        for(Detail detail : details) {
 //            detailBiz.insertSelective(detail);
 //        }
 //    }
 
+    public void calculatePrice(Detail detail) {
+
+    }
+
     /**
      * 子项补充处理
      * @param baseOrder

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

@@ -3,17 +3,35 @@ package com.xxfc.platform.order.service;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import lombok.extern.log4j.Log4j;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
+
 @Service
+@Log4j
 public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicleBiz, OrderRentVehicleDetail> {
 
-    //确定订单为租车类型
-    OrderTypeEnum orderTypeEnum = OrderTypeEnum.RentVehicle;
+
+
+    @PostConstruct
+    public void init(){
+        this.orderTypeEnum = OrderTypeEnum.RentVehicle;
+    }
 
     @Override
-    public void handleItem(OrderRentVehicleDetail item) {
+    public void handleDetail(OrderRentVehicleDetail detail) {
         //获取可用车辆
-        super.handleItem(item);
+        super.handleDetail(detail);
+    }
+
+    @Override
+    public void calculatePrice(OrderRentVehicleDetail detail) {
+        //计算价格
+            //计算车辆费用
+//        detail.get
+            //计算司机费用
+
+//        super.calculatePrice(item);
     }
 }