From 8841ef182bbe06a7ef1f102f51810502dde0a76f Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:26:58 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
index de091c0..53e1556 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -58,7 +58,7 @@
<sql id="Base_Column_List">
o.return_id, o.return_num, o.return_status, o.return_status_describe, o.order_num, o.order_store_num,
- o.order_time, o.send_time, o.send_type, o.pay_type, o.user_id, o.username, o.store_id, o.store_name, o.store_logo,
+ o.order_time, o.send_price, o.send_type, o.pay_type, o.user_id, o.username, o.store_id, o.store_name, o.store_logo,
o.original_price order_original_price, o.paid_price order_paid_price, o.actually_pay_price order_actually_pay_price,
o.refund_price, o.refund_status, o.success_time, o.channel, o.reason, o.remark, o.photos, o.audit_status,
o.audit_user, o.audit_time, o.audit_message, o.rider_id, o.rider_phone, o.rider_name,
@@ -143,7 +143,11 @@
<include refid="Base_Column_List"/>
from sh_order_return as o
<include refid="Where_sql"/>
- order by o.return_id desc ) o
+ order by o.return_id desc
+ <if test="criteria.offset != null">
+ limit #{criteria.offset}, #{criteria.size}
+ </if>
+ ) o
left join sh_order_return_product_snapshot as p on p.return_num = o.return_num
<include refid="Where_Sql_Product"/>
order by o.order_id desc
--
Gitblit v1.9.3