From 3c4e7d691c4e7ab2eb1076e1fdd9b59408883f22 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 30 May 2025 16:39:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(ruoyi-sip):=20=E4=BC=98=E5=8C=96=20OrderDe?=
 =?UTF-8?q?liveryMapper=20=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD-=20?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=20selectOrderDeliveryById=20=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E6=98=8E=E7=A1=AE=E6=8C=87=E5=AE=9A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AD=97=E6=AE=B5=20-=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=20-=20=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=80=A7=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E4=BD=BF=E7=94=A8=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=20SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/manage/OrderDeliveryMapper.xml  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
index 56b8d071..fce74d59 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
@@ -49,8 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectOrderDeliveryById" parameterType="Long" resultMap="OrderDeliveryResult">
-        <include refid="selectOrderDeliveryVo"/>
-        where id = #{id}
+        select t1.id, t1.order_id, t1.delivery_code, t1.delivery_date, t1.delivery_type, t1.logistics_company, t1.logistics_code, t1.receiver_name, t1.receiver_phone, t1.receiver_address, t1.delivery_status, t1.sign_time, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at,
+               t2.order_code,t2.order_name,t1.create_by,t1.update_by
+
+        from order_delivery t1
+                 left join order_info t2 on t1.order_id = t2.id
+        where t1.id = #{id}
     </select>
     <select id="count" resultType="java.lang.Integer">
         select count(1) from order_delivery