From 3b9fdd0dcb466fd11a84cba3d02055f6a9114198 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 21 Nov 2025 12:56:24 +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

---
 .../heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java    | 2 ++
 .../api/controller/mm/AdminPromoterTradeOrderController.java  | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java
index 0e02889..5e5a5a3 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPromoterTradeOrderAwardDao.java
@@ -43,6 +43,8 @@ public interface VvPromoterTradeOrderAwardDao extends BaseMapper<VvPromoterTrade
     int deleteVvPromoterTradeOrderAwardById(@Param("id") Long id);
 
     List<VvPromoterTradeOrderAwardEntity> selectAdminByCondition(IPage page,
+                                                                 @IF Long tradeOrderId,
+                                                                 @IF String status,
                                                                  @IF String promoterId,
                                                                  @IF Long promoterBuyerId,
                                                                  @IF String promoterBuyerName,
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java
index 810306f..ee9e409 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminPromoterTradeOrderController.java
@@ -34,6 +34,7 @@ public class AdminPromoterTradeOrderController {
     @Autowired
     private VvPromoterTradeOrderLineAwardDao vvPromoterTradeOrderLineAwardDao;
 
+
     /***
      * 列表
      * http://localhost:8888/mm/promoter/trade/order/list
@@ -46,6 +47,8 @@ public class AdminPromoterTradeOrderController {
                     @Override
                     public List doSelect(IPage page) {
                         return vvPromoterTradeOrderAwardDao.selectAdminByCondition(page,
+                                request.getTradeOrderId(),
+                                request.getStatus(),
                                 request.getPromoterId(),
                                 request.getPromoterBuyerId(),
                                 request.getPromoterBuyerName(),
@@ -64,7 +67,6 @@ public class AdminPromoterTradeOrderController {
 
         List<VvPromoterTradeOrderAwardEntity> vvPromoterTradeOrderAwardEntities = pageUtils.getRows();
         List<String> promoterIdList = SanUtils.list2FieldList(vvPromoterTradeOrderAwardEntities, VvPromoterTradeOrderAwardEntity::getPromoterId);
-
         List<VvPromoterTradeOrderLineAwardEntity> promoterTradeOrderLineAwardList =
                 vvPromoterTradeOrderLineAwardDao.selectVvPromoterTradeOrderLineAwardByIdList(promoterIdList);