From d64a8d00a48a4c1748fe2ea5af292663f8d44f0a Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 15 Jan 2025 09:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88OrderBasicInfo=E5=92=8COrderD?=
 =?UTF-8?q?etail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/service/OrderBasicInfoService.java   | 5 +++++
 .../pile/service/impl/OrderBasicInfoServiceImpl.java      | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
index b9d036e37..5792b6148 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
@@ -10,6 +10,7 @@ import com.jsowell.pile.domain.*;
 import com.jsowell.pile.dto.*;
 import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
 import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
+import com.jsowell.pile.vo.OrderInfoDetailVO;
 import com.jsowell.pile.vo.SupStationStatsVO;
 import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
 import com.jsowell.pile.vo.base.OrderAmountDetailVO;
@@ -280,6 +281,10 @@ public interface OrderBasicInfoService{
      */
     OrderTotalDataVO getOrderTotalData(QueryOrderDTO orderBasicInfo);
 
+    OrderInfoDetailVO getOrderInfoDetailVO(String orderCode);
+
+    OrderInfoDetailVO getOrderInfoDetailVO(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail);
+
     List<OrderTotalDataVO> getOrderTotalDataV2(QueryOrderDTO dto);
 
     /**
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 5f5326df3..635b1ebad 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -438,9 +438,17 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         return resultVO;
     }
 
+    @Override
+    public OrderInfoDetailVO getOrderInfoDetailVO(String orderCode) {
+        OrderBasicInfo orderInfoByOrderCode = getOrderInfoByOrderCode(orderCode);
+        OrderDetail orderDetail = getOrderDetailByOrderCode(orderCode);
+        return getOrderInfoDetailVO(orderInfoByOrderCode, orderDetail);
+    }
+
     /**
      * 整合OrderBasicInfo和OrderDetail
      */
+    @Override
     public OrderInfoDetailVO getOrderInfoDetailVO(OrderBasicInfo orderBasicInfo, OrderDetail orderDetail) {
         if (orderBasicInfo == null || orderDetail == null) {
             return null;