From 1eee71ca750c806ee0e6d80a4fd44500ceff2ffa Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 04 Jul 2025 17:56:52 +0800
Subject: [PATCH] 小程序：生成确认订单
---
oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
index 0c0e5af..3a37432 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -4,8 +4,11 @@
<resultMap id="BaseResultMap" type="com.oying.modules.sh.domain.OrderReturn">
<id column="return_id" property="returnId"/>
<result column="return_num" property="returnNum"/>
+ <result column="return_status" property="returnStatus"/>
+ <result column="return_status_describe" property="returnStatusDescribe"/>
<result column="order_num" property="orderNum"/>
<result column="user_id" property="userId"/>
+ <result column="username" property="username"/>
<result column="store_id" property="storeId"/>
<result column="store_name" property="storeName"/>
<result column="store_logo" property="storeLogo"/>
@@ -17,6 +20,9 @@
<result column="success_time" property="successTime"/>
<result column="channel" property="channel"/>
<result column="reason" property="reason"/>
+ <result column="remark" property="remark"/>
+ <result column="photos" property="photos"/>
+ <result column="audit_status" property="auditStatus"/>
<result column="audit_user" property="auditUser"/>
<result column="audit_time" property="auditTime"/>
<result column="audit_message" property="auditMessage"/>
@@ -27,7 +33,7 @@
</resultMap>
<sql id="Base_Column_List">
- return_id, return_num, order_num, user_id, store_id, store_name, store_logo, original_price, paid_price, actually_pay_price, refund_price, refund_status, success_time, channel, reason, audit_user, audit_time, audit_message, create_by, create_time, update_by, update_time
+ return_id, return_num, return_status, return_status_describe, order_num, user_id, username, store_id, store_name, store_logo, original_price, paid_price, actually_pay_price, refund_price, refund_status, success_time, channel, reason, remark, photos, audit_status, audit_user, audit_time, audit_message, create_by, create_time, update_by, update_time
</sql>
<select id="findAll" resultMap="BaseResultMap">
@@ -38,12 +44,18 @@
<if test="criteria.returnNum != null">
and return_num like concat('%',#{criteria.returnNum},'%')
</if>
+ <if test="criteria.returnStatus != null">
+ and return_status = #{criteria.returnStatus}
+ </if>
<if test="criteria.orderNum != null">
and order_num like concat('%',#{criteria.orderNum},'%')
</if>
<if test="criteria.userId != null">
and user_id = #{criteria.userId}
</if>
+ <if test="criteria.username != null">
+ and username like concat('%',#{criteria.username},'%')
+ </if>
<if test="criteria.storeId != null">
and store_id = #{criteria.storeId}
</if>
--
Gitblit v1.9.3