From 7457684dc5bed6ac548d0a3cce0699baddf82a4e Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Thu, 19 Mar 2020 20:16:56 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=95=86=E6=88=B7=E7=AB=AFtransaction?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +-
 .../mappers/payment/TransactionMapper.java    |   1 -
 .../core/impls/TradeLogServiceImpl.java       |   3 +-
 .../mappers/payment/TransactionMapper.xml     | 103 +++++++++++++++---
 4 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 078cabd4a..0bb623d5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</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/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
index 9ba8b8f93..f1661a3d4 100644
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.java
@@ -23,7 +23,6 @@ public interface TransactionMapper {
     @AutoSql(type = SqlType.INSERT)
     void save(JSONObject transaction);
 
-    @CountRef(".countTransFlowPage")
     PageList<JSONObject> listTransFlowPage(JSONObject params, PageBounds pagination);
 
     int countTransFlowPage(JSONObject params);
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
index 49f153ba1..f9f65ff54 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java
@@ -536,7 +536,8 @@ public class TradeLogServiceImpl implements TradeLogService {
         JSONObject mchConfig = merchantInfoProvider.getMchExtParams(partner.getIntValue("client_id"));
         params.put("hide_sub_mch", mchConfig.getBooleanValue("hide_sub_mch"));
 
-        List<JSONObject> logs = transactionMapper.listTransFlow(params);
+        List<JSONObject> logs = transactionMapper.listTransFlowPage(params,
+                new PageBounds(query.getPage(), query.getLimit(), Order.formString("transaction_time.desc")));
         TimeZoneUtils.switchTimeZone(logs, timezone, "create_time", "confirm_time", "transaction_time");
         Paginator paginator = new Paginator(query.getPage(), query.getLimit(), logs.size());
         List<JSONObject> pagedLogsList = logs.stream()
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 aff9a9845..2eb204945 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
@@ -21,44 +21,119 @@
           and t.channel = 'Settlement'
     </delete>
     <select id="listTransFlowPage" resultType="com.alibaba.fastjson.JSONObject">
-        SELECT t.*,if(t.refund_id is not null,'refund',if(t.transaction_type='Debit' AND
-        t.system_generate=0,'clearing','payment')) trans_type,
-        if(t.transaction_type='Debit' AND t.refund_id is NULL AND
-        t.system_generate=0,if(locate('MERCHANT',t.system_transaction_id)>0,'Transfer to Merchant','Merchant Service
-        Fee'),t.order_id) order_id2,
-        if(t.transaction_type='Debit' AND t.refund_id is NULL AND t.system_generate=0,'-',t.clearing_status)
-        clear_status,
-        o.order_detail,o.display_amount,o.currency
+        SELECT t.*,
+        o.status,o.source,
+        c.client_moniker,
+        c.short_name,
+        o.dev_id order_dev_id,
+        ifnull(o.client_order_id,'--') client_order_id,
+        if(t.channel='Settlement','clearing',
+        if(t.transaction_type='Credit','payment','refund')) trans_type,
+        if(t.channel='Settlement',
+        if(locate('MERCHANT',t.system_transaction_id)>0, 'Transfer to Merchant','Merchant Service Fee'),
+        if(t.system_generate=0,t.order_id,t.remark)) order_id2,
+        if(t.channel='Settlement','-',CASE t.clearing_status
+        WHEN 0 THEN 'ReadyToClear'
+        WHEN 1 THEN 'Cleared'
+        WHEN 2 THEN 'Preauthorised'
+        END) clear_status,
+        o.order_detail,o.display_amount,o.currency,o.pre_authorization,
+        CASE o.gateway
+        WHEN 0
+        THEN 'Retail In-Store'
+        WHEN 1
+        THEN 'Retail In-Store'
+        WHEN 2
+        THEN 'QR Code'
+        WHEN 3
+        THEN 'Online API'
+        WHEN 4
+        THEN 'WeChat HTML5'
+        WHEN 5
+        THEN 'Retail API'
+        WHEN 6
+        THEN 'Retail API'
+        WHEN 7
+        THEN 'QR Code'
+        WHEN 8
+        THEN 'Mobile H5'
+        WHEN 9
+        THEN 'Third Party Gateway'
+        WHEN 10
+        THEN 'APP'
+        WHEN 12
+        THEN 'MICROAPP'
+        WHEN 13
+        THEN 'Native QR Code'
+        WHEN 14
+        THEN 'Share Link'
+        END AS gateway,
+        CASE o.channel
+        WHEN 'Alipay' THEN ra.login_id
+        WHEN 'AlipayOnline' THEN ra.login_email
+        END login_id
         FROM pmt_transactions t
         LEFT JOIN pmt_orders o ON o.order_id=t.order_id
+        left join sys_customer_relation_alipay ra on ra.alipay_uid = o.customer_id
+        LEFT JOIN sys_clients c on c.client_id = t.client_id
         <where>
-            <if test="client_ids!=null">
+            <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 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=='channel'">
+                    and o.channel = #{search_text}
+                </if>
+                <if test="text_type=='remark'">
+                    and o.order_detail like #{name_pattern}
+                </if>
+                <if test="text_type=='order_id'">
+                    and t.order_id = #{search_text}
+                </if>
+                <if test="text_type=='client_order_id'">
+                    and o.client_order_id = #{search_text}
+                </if>
+            </if>
+            <if test="!hide_sub_mch and client_ids!=null">
                 AND t.client_id IN
                 <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
                     #{client_id}
                 </foreach>
             </if>
-            <if test="client_ids==null">
-                and t.client_id=#{client_id}
+            <if test="!hide_sub_mch and client_ids==null">
+                and c.client_id=#{client_id}
+            </if>
+            <if test="hide_sub_mch">
+                and (c.client_id=#{client_id} or c.parent_client_id=#{client_id})
             </if>
             <if test="from!=null">and t.transaction_time &gt;= #{from}</if>
             <if test="to!=null">and t.transaction_time &lt; #{to}</if>
             <if test="transaction_type!=null">and t.transaction_type=#{transaction_type}</if>
             <if test="date!=null">and date(t.transaction_time)=date(#{date})</if>
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
-            <if test="dev_id!=null">
-                and o.dev_id = #{dev_id}
-            </if>
             <if test="trans_type==1">and t.transaction_type = 'Credit'</if>
             <if test="trans_type==2">and t.refund_id is NOT NULL</if>
             <if test="trans_type==3">and t.transaction_type='Debit' and t.refund_id is NULL</if>
+            <if test="dev_id!=null">
+                and binary o.dev_id = #{dev_id}
+            </if>
             <if test="channel!=null">
                 and
                 <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
                 </foreach>
             </if>
         </where>
+        order by t.transaction_time desc
     </select>
+
     <select id="countTransFlowPage" resultType="int">
         SELECT count(1)
         FROM pmt_transactions t