From 83396a38be3c69c81f8acc4681c18f5dd0e698be Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 08 Jul 2025 21:17:41 +0800
Subject: [PATCH] 完善提交订单逻辑

---
 oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml |   15 ++++++++++++++-
 1 files changed, 14 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 3a37432..4b091cd 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderReturnMapper.xml
@@ -7,6 +7,7 @@
         <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"/>
@@ -33,8 +34,12 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        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
+        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
@@ -49,6 +54,9 @@
             </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}
@@ -77,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