From 5d16a26a496323aa6d288362602513bbd0484012 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:08:01 +0800
Subject: [PATCH] 订单退单sql优化

---
 oying-system/src/main/resources/mapper/sh/OrderMapper.xml |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
index 8e86e97..b390ff9 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -9,6 +9,7 @@
         <result column="order_status_describe" property="orderStatusDescribe"/>
         <result column="order_remark" property="orderRemark"/>
         <result column="order_time" property="orderTime"/>
+        <result column="order_finish_time" property="orderFinishTime"/>
         <result column="packaging_price" property="packagingPrice"/>
         <result column="send_price" property="sendPrice"/>
         <result column="send_type" property="sendType"/>
@@ -45,6 +46,8 @@
         <result column="rider_name" property="riderName"/>
         <collection property="productSnapshots" ofType="com.oying.modules.sh.domain.OrderProductSnapshot">
             <id column="snapshot_id" property="snapshotId"/>
+            <result column="order_num" property="orderNum"/>
+            <result column="store_id" property="storeId"/>
             <result column="product_id" property="productId"/>
             <result column="product_code" property="productCode"/>
             <result column="product_barcode" property="productBarcode"/>
@@ -64,7 +67,7 @@
 
     <sql id="Base_Column_List">
         o.order_id, o.order_num, o.order_store_num, o.order_status, o.order_status_describe,
-        o.order_remark, o.order_time, o.packaging_price, o.send_price, o.send_type, o.user_id, o.username, o.store_id,
+        o.order_remark, o.order_time, o.order_finish_time, o.packaging_price, o.send_price, o.send_type, o.user_id, o.username, o.store_id,
         o.store_name, o.store_logo, o.store_address, o.store_longitude, o.store_latitude,
         o.order_describe, o.original_price order_original_price, o.paid_price order_paid_price,
         o.actually_pay_price order_actually_pay_price, o.pay_state order_pay_state, o.pay_message, o.pay_type, o.pay_time, o.expire_time,
@@ -73,7 +76,7 @@
     </sql>
 
     <sql id="product_Column_List">
-        p.snapshot_id, p.product_id, p.product_code, p.product_barcode, p.product_name, p.product_title,
+        p.snapshot_id, p.order_num, p.store_id, p.product_id, p.product_code, p.product_barcode, p.product_name, p.product_title,
         p.product_main_image, p.product_description, p.param_data, p.unit_price, p.detail_count, p.original_price, p.paid_price,
         p.actually_pay_price, p.pay_state
     </sql>

--
Gitblit v1.9.3