From 8c0391b7f1de524474627057a6ca9a41e4dd26fd Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 11 Apr 2025 16:01:43 +0800
Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E5=A2=9E=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E5=85=B3=E8=81=94=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B4=A7=E5=8D=95=E7=9B=B8=E5=85=B3=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OrderDelivery 模型中添加 orderCode 和 orderName 字段
- 修改 OrderDeliveryMapper.xml 以关联订单信息
- 更新删除操作，使用软删除标记
---
 .../com/ruoyi/sip/domain/OrderDelivery.java   | 21 ++++++++++++++-
 .../mapper/manage/OrderDeliveryMapper.xml     | 27 +++++++++++--------
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
index 8149a56f..21c6700d 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java
@@ -24,6 +24,9 @@ public class OrderDelivery extends BaseEntity
     @Excel(name = "关联合同id")
     private Long orderId;
 
+    private String orderCode;
+    private String orderName;
+
     /** 发货单号 */
     @Excel(name = "发货单号")
     private String deliveryCode;
@@ -68,7 +71,23 @@ public class OrderDelivery extends BaseEntity
     /** 删除时间 */
     private Date deletedAt;
 
-    public void setId(Long id) 
+    public String getOrderCode() {
+        return orderCode;
+    }
+
+    public void setOrderCode(String orderCode) {
+        this.orderCode = orderCode;
+    }
+
+    public String getOrderName() {
+        return orderName;
+    }
+
+    public void setOrderName(String orderName) {
+        this.orderName = orderName;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
index 9c131480..fe1bd48d 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml
@@ -28,14 +28,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectOrderDeliveryList" parameterType="OrderDelivery" resultMap="OrderDeliveryResult">
-        <include refid="selectOrderDeliveryVo"/>
-        <where>  
-            <if test="orderId != null "> and order_id = #{orderId}</if>
-            <if test="deliveryCode != null  and deliveryCode != ''"> and delivery_code like concat('%', #{deliveryCode}, '%')</if>
-            <if test="deliveryDate != null "> and delivery_date = #{deliveryDate}</if>
-            <if test="deliveryType != null  and deliveryType != ''"> and delivery_type = #{deliveryType}</if>
-            <if test="logisticsCompany != null  and logisticsCompany != ''"> and logistics_company = #{logisticsCompany}</if>
-            <if test="deliveryStatus != null  and deliveryStatus != ''"> and delivery_status = #{deliveryStatus}</if>
+        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
+
+        from order_delivery t1
+        left join order_info t2 on t1.order_id = t2.id
+        <where>
+             t1.status=0
+            <if test="orderId != null "> and t1.order_id = #{orderId}</if>
+            <if test="deliveryCode != null  and deliveryCode != ''"> and t1.delivery_code like concat('%', #{deliveryCode}, '%')</if>
+            <if test="deliveryDate != null "> and t1.delivery_date = #{deliveryDate}</if>
+            <if test="deliveryType != null  and deliveryType != ''"> and t1.delivery_type = #{deliveryType}</if>
+            <if test="logisticsCompany != null  and logisticsCompany != ''"> and t1.logistics_company = #{logisticsCompany}</if>
+            <if test="deliveryStatus != null  and deliveryStatus != ''"> and t1.delivery_status = #{deliveryStatus}</if>
         </where>
     </select>
     
@@ -101,15 +106,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedAt != null">updated_at = #{updatedAt},</if>
             <if test="deletedAt != null">deleted_at = #{deletedAt},</if>
         </trim>
-        where id = #{id}
+        where id = #{id} and status=0
     </update>
 
     <delete id="deleteOrderDeliveryById" parameterType="Long">
-        delete from order_delivery where id = #{id}
+        update   order_delivery  set status =1, deleted_at=now()   where id = #{id}
     </delete>
 
     <delete id="deleteOrderDeliveryByIds" parameterType="String">
-        delete from order_delivery where id in 
+        update   order_delivery  set status =1, deleted_at=now()  where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>