From 2baadc3bd8e8d5572fcbdd2e3bff3ac432b711b7 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Mon, 8 Oct 2018 10:20:44 +0800
Subject: [PATCH 1/3] [fix]optimize listorders

---
 .../manage/mappers/payment/OrderMapper.xml    | 147 +++++++++++-------
 1 file changed, 94 insertions(+), 53 deletions(-)

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 1f7447ac5..2b0482c19 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
@@ -95,8 +95,8 @@
             p.client_moniker                           partner_code,
             p.short_name                               partner_name,
             format(o.refund_amount * 100, 0)           refund_fee,
-             t.clearing_status,
-             t.settle_amount
+            t.clearing_status,
+            t.settle_amount
     </sql>
 
     <update id="updateRefundAmount">
@@ -139,7 +139,7 @@
     </update>
 
     <select id="listOrders" resultType="com.alibaba.fastjson.JSONObject">
-        <if test="bd_user!=null">
+        <if test="bd_user != null">
             SELECT temp.* FROM (
         </if>
         <if test="gateway">
@@ -149,80 +149,121 @@
             <include refid="tradelog_list_keys"/>
         </if>
         FROM pmt_orders o
-        INNER JOIN sys_clients p ON p.client_id=o.client_id AND p.is_valid=1
-        <if test="client_ids!=null">
+        INNER JOIN sys_clients p
+        ON p.client_id = o.client_id
+        AND p.is_valid = 1
+        <if test="client_ids != null">
             AND p.client_id IN
             <foreach collection="client_ids" open="(" close=")" separator="," item="client_id">
                 #{client_id}
             </foreach>
         </if>
-        <if test="client_ids==null and client_id !=null">
-            and p.client_id=#{client_id}
+        <if test="client_ids == null and client_id != null">
+            AND p.client_id = #{client_id}
         </if>
-        LEFT JOIN pmt_transactions t on t.order_id=o.order_id and t.refund_id is null and t.transaction_type='Credit'
+        LEFT JOIN pmt_transactions t
+        ON t.order_id = o.order_id
+        AND t.refund_id IS NULL
+        AND t.transaction_type = 'Credit'
         <where>
-            <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 =#{search_text})
+            <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 = #{search_text}
+                    )
                 </if>
-                <if test="text_type=='client_moniker'">
-                    and p.client_moniker=#{search_text}
+                <if test="text_type == 'client_moniker'">
+                    AND p.client_moniker = #{search_text}
                 </if>
-                <if test="text_type=='client_name'">
-                    and p.short_name like #{name_pattern}
+                <if test="text_type == 'client_name'">
+                    AND p.short_name LIKE #{name_pattern}
                 </if>
-                <if test="text_type=='remark'">
-                    and o.order_detail like #{name_pattern}
+                <if test="text_type == 'remark'">
+                    AND o.order_detail LIKE #{name_pattern}
                 </if>
-                <if test="text_type=='channel'">
-                    and o.channel = #{search_text}
+                <if test="text_type == 'channel'">
+                    AND o.channel = #{search_text}
                 </if>
-                <if test="text_type=='sys_trans_id'">
-                    and t.system_transaction_id =#{search_text}
+                <if test="text_type == 'sys_trans_id'">
+                    AND t.system_transaction_id = #{search_text}
                 </if>
-                <if test="text_type=='order_id'">
-                    and o.order_id =#{search_text}
+                <if test="text_type == 'order_id'">
+                    AND o.order_id = #{search_text}
                 </if>
             </if>
-            <if test="order_id!=null">and o.order_id=#{order_id}</if>
-            <if test="trade_type!=null">and o.gateway in
-                <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">#{gateway}</foreach>
+            <if test="order_id != null">
+                AND o.order_id = #{order_id}
             </if>
-            <if test="org_id!=null and org_ids==null">and p.org_id=#{org_id}</if>
-            <if test="org_ids!=null">and p.org_id in
-                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach>
+            <if test="trade_type != null">
+                AND o.gateway IN
+                <foreach collection="trade_type" item="gateway" open="(" close=")" separator=",">
+                    #{gateway}
+                </foreach>
             </if>
-            <if test="from!=null">and o.create_time &gt;= #{from}</if>
-            <if test="to!=null">and o.create_time &lt; #{to}</if>
-            <if test="date!=null">and date(o.create_time)=date(#{date})</if>
-            <if test="dev_id!=null">and o.dev_id=#{dev_id}</if>
-            <if test="status!=null">
-                and
-                <foreach collection="status" item="std" open="(" close=")" separator=" or ">o.status=#{std}</foreach>
+            <if test="org_id != null and org_ids == null">
+                AND p.org_id = #{org_id}
             </if>
-            <if test="channel!=null">
-                and
-                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">o.channel=#{chan}
+            <if test="org_ids != null">
+                AND p.org_id IN
+                <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">
+                    #{org_id}
                 </foreach>
             </if>
-            <if test="bd_group!=null">and p.client_id in
-                (SELECT b.client_id FROM sys_client_bd b
-                INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
-                where b.is_valid=1 and b.start_date&lt;=now() and (b.end_date is null or b.end_date &gt;= now())
-                AND (c.bd_group=#{bd_group} or c.manager_id=#{bd_group})
-                <if test="bd_group_bd">and c.manager_id=#{bd_group_bd}</if>
+            <if test="from != null">
+                AND o.create_time &gt;= #{from}
+            </if>
+            <if test="to != null">
+                AND o.create_time &lt; #{to}
+            </if>
+            <if test="date != null">
+                AND DATE(o.create_time) = DATE(#{date})
+            </if>
+            <if test="dev_id != null">
+                AND o.dev_id = #{dev_id}
+            </if>
+            <if test="status != null">
+                AND
+                <foreach collection="status" item="std" open="(" close=")" separator=" or ">
+                    o.status = #{std}
+                </foreach>
+            </if>
+            <if test="channel != null">
+                AND
+                <foreach collection="channel" item="chan" open="(" close=")" separator=" or ">
+                    o.channel = #{chan}
+                </foreach>
+            </if>
+            <if test="bd_group != null">
+                AND p.client_id IN(
+                    SELECT b.client_id
+                    FROM sys_client_bd b
+                    INNER JOIN financial_bd_config c
+                    ON c.manager_id = b.bd_id
+                    WHERE b.is_valid = 1
+                    AND b.start_date &lt;= now()
+                    AND (b.end_date is null or b.end_date &gt;= now())
+                    AND (c.bd_group = #{bd_group} or c.manager_id = #{bd_group})
+                    <if test="bd_group_bd">
+                        AND c.manager_id = #{bd_group_bd}
+                    </if>
                 )
             </if>
         </where>
-        GROUP BY o.order_id,t.refund_id
-        <if test="bd_user!=null">
+        GROUP BY o.order_id, t.refund_id
+        <if test="bd_user != null">
             ) temp
-            INNER JOIN sys_client_bd d ON temp.client_id = d.client_id AND d.bd_id = #{bd_user} and d.is_valid=1
-            AND date(d.start_date) &lt;= date(now())
-            AND (d.end_date is null or date(d.end_date) &gt;= date(now()))
+            INNER JOIN sys_client_bd d
+            ON temp.client_id = d.client_id
+            AND d.bd_id = #{bd_user}
+            AND d.is_valid = 1
+            AND DATE(d.start_date) &lt;= DATE(now())
+            AND (d.end_date IS NULL OR DATE(d.end_date) &gt;= DATE(now()))
         </if>
     </select>
 

From eed0365d5b4bd69fe8bd9348708cddd5e49022ec Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Mon, 8 Oct 2018 10:51:53 +0800
Subject: [PATCH 2/3] [fix]optimize getBDSaleList

---
 .../analysis/mappers/BDAnalysisMapper.xml     | 83 +++++++++++++------
 1 file changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
index 394f55eef..863a59ed8 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.xml
@@ -3,39 +3,70 @@
 <mapper namespace="au.com.royalpay.payment.manage.analysis.mappers.BDAnalysisMapper">
     <select id="getBDSaleList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
-        d.bd_name,d.bd_id,sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion))
-        total,
-        ifnull(sum(if(temp.refund_id is not null,if(temp.transaction_type='Debit',temp.clearing_amount,-temp.clearing_amount)*d.proportion,0)),0) refund_fee
-        FROM
-        (SELECT l.client_id,l.clearing_amount,l.refund_id,l.transaction_type,o.create_time FROM pmt_transactions l
-        INNER JOIN pmt_orders o
-        ON o.order_id = l.order_id
-        <if test="begin!=null">and o.create_time &gt;= #{begin}</if>
-        <if test="end!=null">and o.create_time &lt; #{end}</if>
-        <if test="begin_month">and DATE_FORMAT(o.create_time,'%Y-%m') &gt;=#{begin_month}</if>
-        <if test="end_month">and DATE_FORMAT(o.create_time,'%Y-%m') &lt;= #{end_month}</if>
-        where (l.transaction_type='Credit' or l.refund_id is not null)
+            d.bd_name,
+            d.bd_id,
+            SUM(if(temp.transaction_type = 'Credit', temp.clearing_amount * d.proportion, -temp.clearing_amount * d.proportion)) total,
+            ifnull(SUM(if(temp.refund_id IS NOT NULL, if(temp.transaction_type='Debit', temp.clearing_amount, -temp.clearing_amount) * d.proportion, 0)), 0) refund_fee
+        FROM(
+            SELECT
+                l.client_id,
+                l.clearing_amount,
+                l.refund_id,
+                l.transaction_type,
+                o.create_time
+            FROM pmt_transactions l
+            INNER JOIN pmt_orders o
+            ON o.order_id = l.order_id
+            <if test="begin != null">
+                AND o.create_time &gt;= #{begin}
+            </if>
+            <if test="end != null">
+                AND o.create_time &lt; #{end}
+            </if>
+            <if test="begin_month">
+                AND DATE_FORMAT(o.create_time, '%Y-%m') &gt;= #{begin_month}
+            </if>
+            <if test="end_month">
+                AND DATE_FORMAT(o.create_time, '%Y-%m') &lt;= #{end_month}
+            </if>
+            WHERE (l.transaction_type = 'Credit' OR l.refund_id IS NOT NULL)
         ) temp
-        INNER JOIN sys_client_bd d ON temp.client_id = d.client_id AND d.start_date &lt;= temp.create_time and
-        d.is_valid = '1'
-        AND (d.end_date is null or d.end_date > temp.create_time)
-        <if test="org_id!=null and org_ids==null">
-            INNER JOIN sys_managers m on m.manager_id = d.bd_id and m.org_id = #{org_id}
+        INNER JOIN sys_client_bd d
+        ON temp.client_id = d.client_id
+        AND d.start_date &lt;= temp.create_time
+        AND d.is_valid = '1'
+        AND (d.end_date IS NULL OR d.end_date > temp.create_time)
+        <if test="org_id != null and org_ids == null">
+            INNER JOIN sys_managers m
+            ON m.manager_id = d.bd_id
+            AND m.org_id = #{org_id}
         </if>
-        <if test="org_ids!=null">
-            INNER JOIN sys_managers m on m.manager_id = d.bd_id and m.org_id in
-            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
-        <if test="bd_group!=null">and temp.client_id in
-            (SELECT b.client_id FROM sys_client_bd b
-            INNER JOIN financial_bd_config c ON c.manager_id=b.bd_id
-            where b.is_valid=1 and b.start_date&lt;=now() and (b.end_date is null or b.end_date &gt;= now())
-            AND (c.bd_group=#{bd_group} or c.manager_id=#{bd_group})
-            <if test="bd_group_bd">and c.manager_id=#{bd_group_bd}</if>
+        <if test="org_ids != null">
+            INNER JOIN sys_managers m
+            ON m.manager_id = d.bd_id
+            AND m.org_id IN
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">
+                #{org_id}
+            </foreach></if>
+        <if test="bd_group != null">
+            AND temp.client_id IN(
+                SELECT b.client_id
+                FROM sys_client_bd b
+                INNER JOIN financial_bd_config c
+                ON c.manager_id = b.bd_id
+                WHERE b.is_valid = 1
+                AND b.start_date &lt;= now()
+                AND (b.end_date IS NULL OR b.end_date &gt;= now())
+                AND (c.bd_group = #{bd_group} OR c.manager_id = #{bd_group})
+                <if test="bd_group_bd">
+                    AND c.manager_id = #{bd_group_bd}
+                </if>
             )
         </if>
         GROUP BY d.bd_id
         ORDER BY total DESC
     </select>
+
     <select id="getBDSalePartnerList" resultType="com.alibaba.fastjson.JSONObject">
         SELECT
         c.client_id,c.client_moniker,c.short_name,c.approve_time,IFNULL(sum(if(temp.transaction_type='Credit',temp.clearing_amount*d.proportion,-temp.clearing_amount*d.proportion)),0)

From c2c6eec7c10078b29e3fb1d13c5f2f5edc106223 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Mon, 8 Oct 2018 15:10:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[fix]=E6=9B=B4=E6=AD=A3royalpay=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../payment/tradelog/templates/partner_settlement_dialog.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 527e66e50..30380e9a6 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -7,7 +7,7 @@
             <ul class="nav nav-pills">
                 <li ng-class="{active:ctrl.channel==null}">
                     <a role="button" ng-click="ctrl.channel=null;channelAndDayOfAnalysis()" title="All">
-                        <img src="/static/images/rpayplus_sign_lg.png">
+                        <img src="/static/images/royalpay_sign.png">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">