From 991a9b39e297574b75194a2e974141460c863284 Mon Sep 17 00:00:00 2001
From: honghy <704887482@qq.com>
Date: Fri, 14 Feb 2025 11:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=8243=20=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6-=E4=BB=98=E6=AC=BE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yudao/module/order/vo/order/OrderQueryVO.java    |  3 +++
 .../src/main/resources/mapper/order/OrderMapper.xml  | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
index 4301b52d..972bbbc2 100644
--- a/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
+++ b/yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/vo/order/OrderQueryVO.java
@@ -658,6 +658,9 @@ public class OrderQueryVO {
     @ApiModelProperty(value = "动态查询审核类型(字典 order_approval_type) 0 为正常")
     private List<Integer> dynamicAuditTypeList;
 
+    @ApiModelProperty(value = "付款人： 1 发货人 2 收货人 3 自定义")
+    private List<Integer> draweeList;
+
 //    @ApiModelProperty(value = "动态查询订单异常状态(字典 order_abnormal_state)")
 //    private List<Integer> dynamicAbnormalStateList;
 //
diff --git a/yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml b/yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
index 1d258150..20d7c1f4 100644
--- a/yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
+++ b/yudao-module-order/yudao-module-order-core/src/main/resources/mapper/order/OrderMapper.xml
@@ -1831,6 +1831,12 @@
 
     <sql id="myOrderQuery">
         <include refid="dynamicQuery"/>
+        <if test="query.draweeList != null and query.draweeList.size()>0 ">
+            AND o.drawee in
+            <foreach item='item' index="index" collection='query.draweeList' open='(' separator=',' close=')'>
+                #{item}
+            </foreach>
+        </if>
         <if test="query.packageType != null and query.packageType != '' ">
             AND CONCAT(',',o.package_type,',') REGEXP CONCAT(',',REPLACE(#{query.packageType},',',',|,'), ',')
         </if>
@@ -2628,6 +2634,12 @@
 
     <sql id="orderQuery">
         <include refid="dynamicQuery"/>
+        <if test="query.draweeList != null and query.draweeList.size()>0 ">
+            AND o.drawee in
+            <foreach item='item' index="index" collection='query.draweeList' open='(' separator=',' close=')'>
+                #{item}
+            </foreach>
+        </if>
         <if test="query.packageType != null and query.packageType != '' ">
             AND CONCAT(',',o.package_type,',') REGEXP CONCAT(',',REPLACE(#{query.packageType},',',',|,'), ',')
         </if>
-- 
2.22.0