订单详情、预约详情

src/main/java/com/chelvc/cloud/admin/controller/CategoryController.java

@@ -91,7 +91,7 @@ public class CategoryController {
     }
 
     /**
-     * 获取一级分类列表
+     * 获取分类列表
      *
      * @return 分类信息列表
      */

src/main/java/com/chelvc/cloud/admin/controller/OrderController.java

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.admin.controller;
 import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
+import com.chelvc.cloud.vehicle.api.dto.OmsOrderDetailDTO;
 import com.chelvc.cloud.vehicle.api.param.OrderPagingParam;
 import com.chelvc.cloud.vehicle.api.service.IOmsOrderService;
 import com.chelvc.framework.base.annotation.ResponseWrapping;
@@ -8,8 +9,10 @@ import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 import javax.validation.Valid;
+import javax.validation.constraints.Min;
 
 /**
  * 订单接口
@@ -34,4 +37,16 @@ public class OrderController {
     public Pagination<OmsOrderDTO> getOrderPaging(@Valid OrderPagingParam param) {
         return this.orderService.getOmsOrderPaging(param);
     }
+
+
+    /**
+     * 查询订单详情
+     *
+     * @param id 查询参数
+     * @return
+     */
+    @GetMapping("/order/{id}")
+    public OmsOrderDetailDTO getOrderDetail(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id) {
+        return this.orderService.detail(id);
+    }
 }

src/main/java/com/chelvc/cloud/admin/controller/ReservationController.java

@@ -1,5 +1,6 @@
 package com.chelvc.cloud.admin.controller;
 
+import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
 import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
 import com.chelvc.cloud.vehicle.api.param.ReservationPagingParam;
 import com.chelvc.cloud.vehicle.api.service.ReservationService;
@@ -45,7 +46,17 @@ public class ReservationController {
      * @param status 预约单的状态
      */
     @PutMapping("/updateReservationsStatus/{id}")
-    public void updateReservationsStatus(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id, @Valid String status) {
+    public void updateReservationsStatus(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id, @Valid ReserveStatus status) {
         this.reservationService.updateReservationsStatus(id, status);
     }
+
+    /**
+     * 获取预约详情
+     * @param id 预约单ID
+     */
+    @GetMapping("/reservation/{id}")
+    public ReservationDTO getDetail(@PathVariable("id") @Min(value = 1, message = "主键不能小于1") Long id) {
+        return this.reservationService.getDetail(id);
+    }
+
 }