From 50927481d20ed5c9133fdb5dfc0b6d26d14d1c99 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 6 Mar 2025 15:08:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/OrderMapper.xml | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 0a51bd9..0f4383d 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -217,13 +217,12 @@
         delete from `order` where id = #{id}
     </delete>
     <select id="list" resultMap="PCBaseResultListMap">
-        select distinct o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
-               refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at,oi.id oiId, oi.goods_id, o.create_at
+        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
+               refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
         from `order`  AS o
         left join face f on o.face_id = f.id
         left join member m on o.member_id = m.id
         left join scenic s on o.scenic_id = s.id
-        left join order_item oi on o.id = oi.order_id
         <where>
             <if test="id!= null ">
                 and o.id = #{id}
@@ -289,13 +288,12 @@
         order by o.create_at desc
     </select>
     <select id="listDetail" resultMap="PCBaseResultMap">
-        select distinct o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
-        refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at,oi.id oiId, oi.goods_id, o.create_at
+        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
+        refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
         from `order`  AS o
         left join face f on o.face_id = f.id
         left join member m on o.member_id = m.id
         left join scenic s on o.scenic_id = s.id
-        left join order_item oi on o.id = oi.order_id
         <where>
             <if test="id!= null ">
                 and o.id = #{id}
@@ -376,7 +374,7 @@
         where o.member_id = #{userId}
     </select>
     <select id="appList" resultMap="AppBaseResultMap">
-        select DISTINCT  o.id, o.member_id,o.openid, o.type, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
+        select  o.id, o.member_id,o.openid, o.type, o.face_id, f.face_url, o.price, pay_price, remark, o.broker_id, o.promo_code,
         refund_reason, refund_status, o.`status`, o.create_at, refund_at, pay_at, cancel_at,
         sc.name scenicName
         from `order` AS o
@@ -390,7 +388,7 @@
         order by o.create_at desc
     </select>
     <select id="appDetail" resultMap="AppBaseResultMap">
-        select distinct o.id, o.member_id,o.openid, o.type, o.price, o.slash_price, pay_price, remark, o.broker_id, o.promo_code,
+        select o.id, o.member_id,o.openid, o.type, o.price, o.slash_price, pay_price, remark, o.broker_id, o.promo_code,
                         refund_reason, refund_status, o.`status`, o.create_at, refund_at, pay_at, cancel_at,
                         o.scenic_id, sc.name scenicName
         from `order`  AS o
@@ -399,12 +397,11 @@
         where o.id = #{id}
     </select>
     <select id="refundList" resultType="com.ycwl.basic.model.pc.order.resp.OrderRespVO">
-        select distinct o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
-        refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at,oi.id oiId, oi.goods_id, o.create_at
+        select o.id, o.scenic_id, s.name as scenic_name, o.member_id,m.nickname ,m.real_name, o.type, o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
+        refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.create_at
         from `order`  AS o
         left join member m on o.member_id = m.id
         left join scenic s on o.scenic_id = s.id
-        left join order_item oi on o.id = oi.order_id
         <where>
             o.refund_status != 0
             <if test="id!= null ">