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/ScoreOrderMapper.xml |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 662b086..41526d6 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -21,10 +21,14 @@
         </if>
 
         <if test="name != null and name != ''">
-            and b.nick_name like concat('%',#{name},'%')
+            and (b.nick_name like concat('%',#{name},'%')
+                     or b.mobile_phone like concat('%',#{accountName},'%') )
         </if>
-        <if test="status != null and status != ''">
-            and a.status = #{status}
+        <if test="status.size > 0">
+            and a.status in
+            <foreach collection="status" item="sta" open="(" separator="," close=")">
+                #{sta}
+            </foreach>
         </if>
         <if test="createdTimeStart != null">
             and a.CREATED_TIME >= #{createdTimeStart}
@@ -33,7 +37,21 @@
         <if test="createdTimeEnd != null">
             and a.CREATED_TIME &lt;= #{createdTimeEnd}
         </if>
-        order by a.CREATED_TIME desc
+        order by
+            <if test="namePx != null and namePx != '' and namePx == 1">
+                a.CREATED_TIME
+            </if>
+            <if test="namePx != null and namePx != '' and namePx == 2">
+                from_base64(b.nick_name)
+            </if>
+
+            <if test="typePx != null and typePx != '' and typePx == 1">
+                asc
+            </if>
+            <if test="typePx != null and typePx != '' and typePx == 2">
+                desc
+            </if>
+
     </select>
 
     <select id="selectXcxOrderList" resultType="com.xzx.gc.shop.vo.XcxOrderListVo">

--
Gitblit v1.9.1