From 5f8c4fd6e6f70efcd09eabb0f550b91e26b5c865 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 17 Jun 2025 15:53:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/pc/order/req/OrderReqQuery.java     | 10 --------
 src/main/resources/mapper/OrderMapper.xml     | 25 ++-----------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
index ab86990..0bf53d3 100644
--- a/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
+++ b/src/main/java/com/ycwl/basic/model/pc/order/req/OrderReqQuery.java
@@ -33,16 +33,6 @@ public class OrderReqQuery extends BaseQueryParameterReq {
      */
     @ApiModelProperty("微信openId")
     private Long openId;
-    /**
-     * 价格
-     */
-    @ApiModelProperty("价格")
-    private BigDecimal price;
-    /**
-     * 实际支付价格
-     */
-    @ApiModelProperty("实际支付价格")
-    private BigDecimal payPrice;
     /**
      * 备注
      */
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 13ec798..bef6435 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -244,7 +244,7 @@
         left join scenic s on o.scenic_id = s.id
         <where>
             <if test="id!= null ">
-                and o.id = #{id}
+                and o.id LIKE CONCAT('%',#{id},'%')
             </if>
             <if test="scenicId != null">
                 and o.scenic_id = #{scenicId}
@@ -253,26 +253,17 @@
                 and m.nickname like concat('%',#{memberNickname},'%')
             </if>
             <if test="memberId != null">
-                and o.member_id like concat('%',#{memberId},'%')
+                and (o.member_id like concat('%',#{memberId},'%') or m.uid like concat('%',#{memberId},'%'))
             </if>
             <if test="memberUid!= null">
                 and m.uid = #{memberUid}
             </if>
-            <if test="price!= null ">
-                and o.price = #{price}
-            </if>
-            <if test="payPrice!= null ">
-                and pay_price = #{payPrice}
-            </if>
             <if test="remark!= null and remark!= ''">
                 and remark like concat('%',#{remark},'%')
             </if>
             <if test="brokerId!= null ">
                 and o.broker_id = #{brokerId}
             </if>
-            <if test="promoCode!= null and promoCode!= ''">
-                and o.promo_code like concat('%',#{promoCode},'%')
-            </if>
             <if test="refundReason!= null and refundReason!= ''">
                 and refund_reason like concat('%',#{refundReason},'%')
             </if>
@@ -338,12 +329,6 @@
             <if test="memberUid!= null">
                 and m.uid = #{memberUid}
             </if>
-            <if test="price!= null ">
-                and o.price = #{price}
-            </if>
-            <if test="payPrice!= null ">
-                and pay_price = #{payPrice}
-            </if>
             <if test="remark!= null and remark!= ''">
                 and remark like concat('%',#{remark},'%')
             </if>
@@ -450,12 +435,6 @@
             <if test="memberUid!= null">
                 and m.uid = #{memberUid}
             </if>
-            <if test="price!= null ">
-                and o.price = #{price}
-            </if>
-            <if test="payPrice!= null ">
-                and pay_price = #{payPrice}
-            </if>
             <if test="remark!= null and remark!= ''">
                 and remark like concat('%',#{remark},'%')
             </if>