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/OrderMapper.xml |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
index 427731f..44a5e20 100644
--- a/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
+++ b/oying-system/src/main/resources/mapper/sh/OrderMapper.xml
@@ -4,7 +4,10 @@
     <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="username" property="username"/>
         <result column="store_id" property="storeId"/>
         <result column="store_name" property="storeName"/>
         <result column="store_logo" property="storeLogo"/>
@@ -31,7 +34,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        order_id, order_num, 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
+        order_id, order_num, order_status, order_status_describe, user_id, username, 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">
@@ -42,9 +45,15 @@
             <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}
             </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