From 71bab8c82c428193853da9ffd7a6c4ea940fc596 Mon Sep 17 00:00:00 2001
From: bunny <1319900154@qq.com>
Date: Wed, 10 Jan 2024 20:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sky/controller/user/OrderController.java  | 14 +++++++++++++
 .../java/com/sky/service/OrderService.java    |  9 +++++++++
 .../sky/service/impl/OrderServiceImpl.java    | 20 +++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/sky-server/src/main/java/com/sky/controller/user/OrderController.java b/sky-server/src/main/java/com/sky/controller/user/OrderController.java
index 97d5134..e28faa1 100644
--- a/sky-server/src/main/java/com/sky/controller/user/OrderController.java
+++ b/sky-server/src/main/java/com/sky/controller/user/OrderController.java
@@ -7,6 +7,7 @@ import com.sky.result.Result;
 import com.sky.service.OrderService;
 import com.sky.vo.OrderPaymentVO;
 import com.sky.vo.OrderSubmitVO;
+import com.sky.vo.OrderVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -80,4 +81,17 @@ public class OrderController {
         PageResult pageResult = orderService.pageQuery4User(page, pageSize, status);
         return Result.success(pageResult);
     }
+
+    /**
+     * 查询订单详情
+     *
+     * @param id 查询订单id
+     * @return OrderVO
+     */
+    @ApiOperation("查询订单详情")
+    @GetMapping("/orderDetail/{id}")
+    public Result<OrderVO> orderDetail(@PathVariable Long id) {
+        OrderVO orderVO = orderService.detail(id);
+        return Result.success(orderVO);
+    }
 }
diff --git a/sky-server/src/main/java/com/sky/service/OrderService.java b/sky-server/src/main/java/com/sky/service/OrderService.java
index 2b3bf6c..a5c51d6 100644
--- a/sky-server/src/main/java/com/sky/service/OrderService.java
+++ b/sky-server/src/main/java/com/sky/service/OrderService.java
@@ -5,6 +5,7 @@ import com.sky.dto.OrdersSubmitDTO;
 import com.sky.result.PageResult;
 import com.sky.vo.OrderPaymentVO;
 import com.sky.vo.OrderSubmitVO;
+import com.sky.vo.OrderVO;
 
 public interface OrderService {
     /**
@@ -46,4 +47,12 @@ public interface OrderService {
      * @return PageResult
      */
     PageResult pageQuery4User(int pageNum, int pageSize, Integer status);
+
+    /**
+     * 查询订单详情
+     *
+     * @param id 查询订单id
+     * @return OrderVO
+     */
+    OrderVO detail(Long id);
 }
diff --git a/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java
index 0b88ed4..bd2cf9a 100644
--- a/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java
+++ b/sky-server/src/main/java/com/sky/service/impl/OrderServiceImpl.java
@@ -207,6 +207,26 @@ public class OrderServiceImpl implements OrderService {
         assert page != null;
         return new PageResult(page.getTotal(), list);
     }
+
+    /**
+     * 查询订单详情
+     *
+     * @param id 查询订单id
+     * @return OrderVO
+     */
+    @Override
+    public OrderVO detail(Long id) {
+        // 根据id查询订单
+        Orders orders = orderMapper.getById(id);
+        // 查询该订单对应的菜品/套餐明细
+        List<OrderDetail> orderDetailList = orderDetailMapper.getByOrderId(orders.getId());
+
+        // 将该订单及其详情封装到OrderVO并返回
+        OrderVO orderVO = new OrderVO();
+        BeanUtils.copyProperties(orders, orderVO);
+        orderVO.setOrderDetailList(orderDetailList);
+        return orderVO;
+    }
 }