From 7e0ec9370674ceb6f6daf944fed5e3c3ae7c9757 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Sun, 16 Nov 2025 17:16:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/mm/order/resp/VVOrderDetailResp.java  | 15 +--------------
 .../api/controller/mm/AdminOrderController.java   |  8 +++++---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java
index 344fbdf..d44e51d 100644
--- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java
+++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VVOrderDetailResp.java
@@ -1,37 +1,24 @@
 package com.heyu.api.alibaba.request.mm.order.resp;
 
 
-import com.heyu.api.data.entity.vv.VvBuyerAddressEntity;
 import com.heyu.api.data.entity.vv.VvBuyerEntity;
-import com.heyu.api.data.entity.vv.VvTradeOrderEntity;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class VVOrderDetailResp {
 
 
-    /***
-     * 订单信息
-     */
-    private VvTradeOrderEntity vvTradeOrderEntity;
-
 
     /***
      * 订单行信息
      */
-    private List<VVOrderListResp> vvTradeOrderLineEntityList;
-
+    private VVOrderListResp vvTradeOrderResp;
 
     /***
      * 订单信息
      */
     private VvBuyerEntity vvBuyerEntity;
 
-
-
-
 }
 
 
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
index e915fbf..b232e42 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
@@ -177,17 +177,19 @@ public class AdminOrderController {
     @RequestMapping("/detail")
     public R detail(@RequestBody VVOrderDetailRequest request) {
         VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(request.getTradeOrderId());
+
         List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderId(request.getTradeOrderId());
 
         List<VvTradeOrderEntity> vvTradeOrderEntities = SanUtils.asList(vvTradeOrderEntity);
 
-        List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList,false);
+        List<VVOrderListResp> vvOrderListResps = vvTradeOrderConvertService.convertTradeOrderLineResp(vvTradeOrderEntities, vvTradeOrderLineEntityList, false);
 
         VVOrderDetailResp vvOrderDetailResp = new VVOrderDetailResp();
-        vvOrderDetailResp.setVvTradeOrderEntity(vvTradeOrderEntity);
 
-        vvOrderDetailResp.setVvTradeOrderLineEntityList(vvOrderListResps);
+        vvOrderDetailResp.setVvTradeOrderResp(vvOrderListResps.get(0));
+
         VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerById(vvTradeOrderEntity.getBuyerId());
+
         vvOrderDetailResp.setVvBuyerEntity(vvBuyerEntity);
 
         return R.ok().setData(vvOrderDetailResp);