From a8fb0a175ff61c82819e7da191030c2f5e90ae98 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 Aug 2021 17:10:22 +0800
Subject: [PATCH] 20210818

---
 gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index c9d3c40..a626a11 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -26,11 +26,15 @@
         <if test="record.orderNo != null and record.orderNo != ''">
             and a.order_no like concat('%',#{record.orderNo},'%')
         </if>
-        <if test="record.status != null and record.status != ''">
-            and a.status = #{record.status}
+        <if test="record.status.size > 0">
+            and a.status in
+            <foreach collection="record.status" item="sta" open="(" separator="," close=")">
+                #{sta}
+            </foreach>
         </if>
         <if test="record.jwyName != null and record.jwyName != ''">
-            and d.username like concat('%',#{record.jwyName},'%')
+            and (d.username like concat('%',#{record.jwyName},'%')
+                 or d.mobile like concat('%',#{record.jwyName},'%'))
         </if>
         <if test="record.account != null and record.account != ''">
             and ( a.username like concat('%',#{record.account},'%')
@@ -43,7 +47,20 @@
         <if test="record.reserveTimeEnd != null">
             and a.reserve_date &lt;= #{record.reserveTimeEnd}
         </if>
-        order by a.CREATED_TIME desc
+        order by
+        <if test="record.namePx != null and record.namePx != '' and record.namePx == 1">
+            a.CREATED_TIME
+        </if>
+        <if test="record.namePx != null and record.namePx != '' and record.namePx == 2">
+            a.username
+        </if>
+
+        <if test="record.typePx != null and record.typePx != '' and record.typePx == 1">
+            asc
+        </if>
+        <if test="record.typePx != null and record.typePx != '' and record.typePx == 2">
+            desc
+        </if>
     </select>
 
 
@@ -99,4 +116,8 @@
         inner join xzx_jhy_order_items b on a.id=b.order_id
         where a.user_id=#{userId}
     </select>
+
+    <select id="selectJhyInfoByUserId" resultType="com.xzx.gc.entity.JhyInfo">
+        select * from xzx_jhy_info where id = #{jhyId}
+    </select>
 </mapper>

--
Gitblit v1.9.1