From 5ee2b01bab609b09b2193332121cc6950d194d5f Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Thu, 28 Aug 2025 22:13:50 +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

---
 .../com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java     | 2 +-
 .../src/main/java/com/heyu/api/data/utils/SanUtils.java   | 6 +++---
 .../com/heyu/api/alibaba/request/vv/AppOrderRequest.java  | 8 ++++++--
 .../java/com/heyu/api/controller/mm/OrderController.java  | 3 +++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java
index 7be2afe..ca0e5c4 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java
@@ -93,7 +93,7 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
 
 
 
-
+    @OrderBy(VvTradeOrderLineEntity.id_)
     List<VvTradeOrderLineEntity> selectByAdminConditionList(
                                                         @IF @IN List<Long> tradeOrderIds,
                                                         @IF @LIKE String buyerPhone,
diff --git a/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java b/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java
index 1b616af..3f3921d 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/utils/SanUtils.java
@@ -38,11 +38,11 @@ public class SanUtils {
 
         List<R> list = list2list(values, function);
 
-        List<R>  result = new ArrayList<>();
+        List<R> result = new ArrayList<>();
 
-        if(CollectionUtils.isEmpty(list)){
+        if (CollectionUtils.isNotEmpty(list)) {
             for (R r : list) {
-                if(r!=null){
+                if (r != null) {
                     result.add(r);
                 }
             }
diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java
index f67922d..f32e19a 100644
--- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java
+++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java
@@ -13,9 +13,14 @@ public class AppOrderRequest {
 
     private int pageSize = 10;
 
-
+    /***
+     * 买家id
+     */
     private Long buyerId;
 
+    /***
+     * 订单号id
+     */
     private List<Long> tradeOrderIds;
 
     //商品名称 , 子单维度
@@ -27,7 +32,6 @@ public class AppOrderRequest {
     //创建时间撮 最小
     private Long maxCreateTimestamp;
 
-
     /**
      * 按时间排序
      */
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java
index de9a73e..3c004d1 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/OrderController.java
@@ -99,6 +99,9 @@ public class OrderController {
             vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()));
         }
 
+
+        vvOrderRequest.setTradeOrderIds(tradeOrderIds);
+
         // 重新获取子单
         List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectByAdminConditionList(
                 vvOrderRequest.getTradeOrderIds(),