From a576bf75eec664e7b167a7a5eb6fabe2552ccbcc Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 12 九月 2025 19:17:28 +0800
Subject: [PATCH] 修改礼品卡领取

---
 framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
index 0bae393..5075613 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
@@ -53,6 +53,8 @@
 
     @ApiModelProperty(value = "涔板鏄电О")
     private String buyerName;
+    @ApiModelProperty(value = "鐢ㄦ埛鏄电О")
+    private String nickName;
 
     @ApiModelProperty(value = "璁㈠崟鐘舵��")
     private String orderStatus;
@@ -115,6 +117,9 @@
     @ApiModelProperty(value = "璁㈠崟淇冮攢绫诲瀷")
     private String orderPromotionType;
 
+    private String couponFlag;
+
+
     public <T> QueryWrapper<T> queryWrapper() {
         AuthUser currentUser = UserContext.getCurrentUser();
         QueryWrapper<T> wrapper = new QueryWrapper<>();
@@ -172,9 +177,14 @@
         //璁㈠崟鏉ユ簮
         wrapper.like(CharSequenceUtil.isNotEmpty(clientType), "o.client_type", clientType);
 
+        //鐢ㄦ埛鏄电О
+        wrapper.like(CharSequenceUtil.isNotEmpty(nickName),"m.nick_name",nickName);
+
         //鎸夎瘎浠风姸鎬�
         wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus);
 
+        wrapper.eq(CharSequenceUtil.isNotEmpty(couponFlag),"o.coupon_flag", couponFlag);
+
         //鎸夋爣绛炬煡璇�
         if (CharSequenceUtil.isNotEmpty(tag)) {
             String orderStatusColumn = "o.order_status";

--
Gitblit v1.8.0