diff --git a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
index fa7e11c6a..86d41fb63 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/admin/AdminOrderController.java
@@ -44,7 +44,7 @@ public class AdminOrderController {
     }
 
     @GetMapping("/getOrderById")
-    public CzgResult<Map<String, Object>> getOrderById(Long orderId) {
+    public CzgResult<HistoryOrderVo> getOrderById(Long orderId) {
         return orderInfoService.getOrderDetails(orderId);
     }
 
diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
index 4d9191092..095c8e754 100644
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UserOrderController.java
@@ -41,7 +41,7 @@ public class UserOrderController {
     }
 
     @GetMapping("/getOrderById")
-    public CzgResult<Map<String, Object>> getOrderById(Long orderId) {
+    public CzgResult<HistoryOrderVo> getOrderById(Long orderId) {
         return orderInfoService.getOrderDetails(orderId);
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
index a7e1af8a8..37d27453a 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java
@@ -31,7 +31,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
 
     Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
 
-    CzgResult<Map<String, Object>> getOrderDetails(Long orderId);
+    CzgResult<HistoryOrderVo> getOrderDetails(Long orderId);
 
     HistoryOrderVo historyOrder(Long orderId, String tableCode);
 
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
index ea7548762..fdc188e81 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
@@ -130,15 +130,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     }
 
     @Override
-    public CzgResult<Map<String, Object>> getOrderDetails(Long orderId) {
+    public CzgResult<HistoryOrderVo> getOrderDetails(Long orderId) {
         AssertUtil.isNull(orderId, "订单id不能为空");
-        OrderInfo orderInfo = getById(orderId);
-        AssertUtil.isNull(orderInfo, "订单信息不存在");
-        List<OrderDetail> orderDetails = orderDetailService.queryChain().select().eq(OrderDetail::getOrderId, orderId).list();
-        Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("orderInfo", orderInfo);
-        resultMap.put("orderDetails", orderDetails);
-        return CzgResult.success(resultMap);
+        return CzgResult.success(historyOrder(orderId, null));
     }
 
     @Override
@@ -156,8 +150,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     .oneAs(HistoryOrderVo.class);
         } else {
             historyOrderVo = getOneAs(new QueryWrapper()
-                    .eq(OrderInfo::getId, orderId)
-                    .eq(OrderInfo::getStatus, OrderStatusEnums.UNPAID.getCode()), HistoryOrderVo.class);
+                    .eq(OrderInfo::getId, orderId), HistoryOrderVo.class);
         }
         if (historyOrderVo == null || historyOrderVo.getId() == null) {
             return null;
@@ -173,7 +166,6 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             Integer placeNum = orderDetail.getPlaceNum();
             // 检查 Map 中是否已经存在该 placeNum 对应的列表
             resultMap.computeIfAbsent(placeNum.toString(), k -> new ArrayList<>()).add(orderDetail);
-
         }
         historyOrderVo.setDetailMap(resultMap);
         return historyOrderVo;