From 7ffdcc19d603d132c159c9eac4a2a1b57ec82970 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 23:03:28 +0800
Subject: [PATCH] 订单、退单状态信息

---
 oying-system/src/main/resources/mapper/sh/OrderMapper.xml |   11 +++++++++--
 1 files changed, 9 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 184665f..6a09cbc 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -4,8 +4,12 @@
     <resultMap id="BaseResultMap" type="com.oying.modules.sh.domain.Order">
         <id column="order_id" property="orderId"/>
         <result column="order_num" property="orderNum"/>
+        <result column="order_status" property="orderStatus"/>
+        <result column="order_status_describe" property="orderStatusDescribe"/>
         <result column="user_id" property="userId"/>
         <result column="store_id" property="storeId"/>
+        <result column="store_name" property="storeName"/>
+        <result column="store_logo" property="storeLogo"/>
         <result column="order_describe" property="orderDescribe"/>
         <result column="original_price" property="originalPrice"/>
         <result column="paid_price" property="paidPrice"/>
@@ -29,7 +33,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        order_id, order_num, user_id, store_id, order_describe, original_price, paid_price, actually_pay_price, pay_state, pay_message, pay_type, pay_time, expire_time, openid, app_id, timestamp, nonce_str, package_val, sign_type, pay_sign, create_by, create_time, update_by, update_time
+        order_id, order_num, order_status, order_status_describe, user_id, store_id, store_name, store_logo, order_describe, original_price, paid_price, actually_pay_price, pay_state, pay_message, pay_type, pay_time, expire_time, openid, app_id, timestamp, nonce_str, package_val, sign_type, pay_sign, create_by, create_time, update_by, update_time
     </sql>
 
     <select id="findAll" resultMap="BaseResultMap">
@@ -39,6 +43,9 @@
         <where>
             <if test="criteria.orderNum != null">
                 and order_num like concat('%',#{criteria.orderNum},'%')
+            </if>
+            <if test="criteria.orderStatus != null">
+                and order_status = #{criteria.orderStatus}
             </if>
             <if test="criteria.userId != null">
                 and user_id = #{criteria.userId}
@@ -64,4 +71,4 @@
         </where>
         order by order_id desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

--
Gitblit v1.9.3