From abe96475ac8d7ff09139ea26c4497e5e9b4c2ad2 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 24 Feb 2020 17:37:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                        |  2 +-
 .../manage/mappers/payment/OrderMapper.xml     | 15 +++++----------
 .../mappers/payment/TransactionMapper.xml      | 18 ++++++++++--------
 3 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index ead673ed8..89fb0c682 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.3.57</version>
+    <version>1.3.58</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.8.0</jib-maven-plugin.version>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index 6ee07aac1..bbcb11c6c 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -486,20 +486,15 @@
             <if test="search_text!=null">
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
-                    and (p.client_moniker=#{search_text} or p.short_name like #{name_pattern} or o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
-                    t.order_id = #{name_pattern}
-                    or o.client_order_id = #{name_pattern})
-                </if>
-                <if test="text_type=='client_moniker'">
-                    and p.client_moniker=#{search_text}
+                    and (o.order_detail like #{name_pattern}
+                    or t.system_transaction_id like #{name_pattern}
+                    or o.channel = #{search_text}
+                    or t.order_id like #{name_pattern}
+                    or o.client_order_id like #{name_pattern})
                 </if>
                 <if test="text_type=='sys_trans_id'">
                     and t.system_transaction_id =#{search_text}
                 </if>
-                <if test="text_type=='client_name'">
-                    and p.short_name like #{name_pattern}
-                </if>
                 <if test="text_type=='channel'">
                     and o.channel = #{search_text}
                 </if>
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
index a6916d5ad..73dd48ed8 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
@@ -159,10 +159,11 @@
             <if test="search_text!=null">
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
-                    and (o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
-                    t.order_id = #{name_pattern}
-                    or o.client_order_id = #{name_pattern})
+                    and (o.order_detail like #{name_pattern}
+                    or t.system_transaction_id like #{name_pattern}
+                    or o.channel = #{search_text}
+                    or t.order_id like #{name_pattern}
+                    or o.client_order_id like #{name_pattern})
                 </if>
                 <if test="text_type=='sys_trans_id'">
                     and t.system_transaction_id =#{search_text}
@@ -258,10 +259,11 @@
             <if test="search_text!=null">
                 <bind name="name_pattern" value="'%'+search_text+'%'"/>
                 <if test="text_type=='all'">
-                    and (o.order_detail like
-                    #{name_pattern} or t.system_transaction_id=#{search_text} or o.channel = #{search_text} or
-                    t.order_id = #{name_pattern}
-                    or o.client_order_id = #{name_pattern})
+                    and (o.order_detail like #{name_pattern}
+                    or t.system_transaction_id like #{name_pattern}
+                    or o.channel = #{search_text}
+                    or t.order_id like #{name_pattern}
+                    or o.client_order_id like #{name_pattern})
                 </if>
                 <if test="text_type=='sys_trans_id'">
                     and t.system_transaction_id =#{search_text}