From 3caa0b05a620aa7714de0d63c804e43aa6486c9b Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 11 Jul 2025 18:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml | 24 +++++++++++++++++++++++-
1 files changed, 23 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 2826d0b..4b091cd 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -4,8 +4,12 @@
<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="pay_type" property="payType"/>
<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"/>
@@ -30,8 +34,12 @@
</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, remark, photos, audit_status, 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, pay_type, 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>
+ <update id="updatePayStatus">
+ update sh_order_return set return_status = #{payState}, success_time = #{payTime}
+ where order_num = #{orderNum}
+ </update>
<select id="findAll" resultMap="BaseResultMap">
select
@@ -41,11 +49,20 @@
<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.payType != null">
+ and pay_type = #{criteria.payType}
+ </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}
@@ -68,4 +85,9 @@
</where>
order by return_id desc
</select>
+ <select id="getByReturnNum" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"/>
+ from sh_order_return where return_num = #{returnNum}
+ </select>
</mapper>
--
Gitblit v1.9.3