From 6e60424265923d2f38e676de050061c4ffabc942 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Wed, 19 Sep 2018 16:16:45 +0800
Subject: [PATCH 1/8] fix merchant_id

---
 .../templates/apply_rpay_sub_merchant_id.html     | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
index bf36efcf3..f7d130c75 100644
--- a/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
+++ b/src/main/ui/static/payment/partner/templates/apply_rpay_sub_merchant_id.html
@@ -77,22 +77,17 @@
                                 </div>
                             </div>
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.acn.$invalid && subForm.acn.$dirty}">
-                                <label class="control-label col-sm-3" for="acn_input">* acn</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="acn_input">acn</label>
                                 <div class="col-sm-8">
                                     <input class="form-control" ng-model="subMerchantInfo.acn"
-                                           type="text" name="acn" id="acn_input" required maxlength="256">
-                                    <div ng-messages="subForm.acn.$error" ng-if="subForm.acn.$dirty">
-                                        <p class="small text-danger" ng-message="required">Required Field</p>
-                                    </div>
+                                           type="text" name="acn" id="acn_input">
                                 </div>
                             </div>
 
 
-                            <div class="form-group"
-                                 ng-class="{'has-error':subForm.business_structure.$invalid && subForm.business_structure.$dirty}">
-                                <label class="control-label col-sm-3" for="business-structure-input">* Business Structure</label>
+                            <div class="form-group">
+                                <label class="control-label col-sm-3" for="business-structure-input">Business Structure</label>
                                 <div class="col-sm-8">
                                     <select class="form-control" name="business_structure"  ng-model="subMerchantInfo.business_structure"
                                             id="business-structure-input"

From f1ea323c28cfca1ba9704d4592260e5b86a32666 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 19 Sep 2018 16:27:52 +0800
Subject: [PATCH 2/8] =?UTF-8?q?[fix]channel=E6=B7=BB=E5=8A=A0Rpay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/impls/ChannelsAnalysisServiceImpl.java    |  2 +-
 .../analysis/core/impls/DashboardServiceImpl.java  |  2 +-
 .../bdprize/core/impls/BDPrizeServiceImpl.java     |  2 +-
 src/main/ui/static/analysis/clearing-log.js        |  2 ++
 .../templates/settlement_transactions.html         |  5 +++++
 .../commons/services/clearingDetailService.js      |  2 ++
 src/main/ui/static/config/bdprize/bdprize.js       |  2 ++
 .../config/bdprize/templates/bd_prize_detail.html  | 14 ++++++++++++++
 .../bdprize/templates/bd_prize_month_report.html   | 12 ++++++++++++
 .../templates/partner_settlement_dialog.html       |  5 +++++
 .../payment/tradelog/templates/trade_logs.html     |  2 ++
 11 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java
index 1b3f2b439..5ad52e954 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/ChannelsAnalysisServiceImpl.java
@@ -40,7 +40,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
         }
         List<JSONObject> list = new ArrayList<>();
         Map<Date,JSONObject> analysisMap = new TreeMap<>();
-        String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf"};
+        String[] channels = {"Wechat","Bestpay","Alipay","jd","AlipayOnline","hf", "Rpay"};
         for (String channel:channels){
             analysisChannelCustomers(params, analysisMap, channel);
         }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 75cff47fa..261626c82 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -553,7 +553,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
     }
     private JSONObject getTodayChannelCount(JSONObject params){
-        String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf"};
+        String[] channels = new String[]{"Bestpay","Wechat","Alipay","jd","AlipayOnline","hf", "Rpay"};
         JSONObject resp = new JSONObject();
         for(String channel:channels) {
             params.put("channel", channel);
diff --git a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
index 99217ffa0..85b8e6ae8 100644
--- a/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/bdprize/core/impls/BDPrizeServiceImpl.java
@@ -80,7 +80,7 @@ public class BDPrizeServiceImpl implements BDPrizeService {
 
     private static BigDecimal percent = new BigDecimal(100);
 
-    private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf"};
+    private static String[] channels = new String[]{"Wechat", "Alipay", "Bestpay", "jd", "AlipayOnline","hf", "Rpay"};
     private static Logger logger = LoggerFactory.getLogger(BDPrizeServiceImpl.class);
 
     @Override
diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index cb1429ab3..9ecebf963 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -542,6 +542,8 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                     return '/static/images/jd_sign_lg.png';
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
+                case 'Rpay':
+                    return '/static/images/royalpay_sign.png';
             }
         }
     });
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index c1f522e0c..ddb451ebe 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -48,6 +48,11 @@
                         <img src="/static/images/hf_sign_lg.png" class="channel-icon-lg">
                     </a>
                 </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
+                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
+                    </a>
+                </li>
             </ul>
         </div>
     </div>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index bc2d39f35..bcd54527e 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -60,6 +60,8 @@ define(['../app','decimal'], function (app,Decimal) {
                     return '/static/images/jd_sign_lg.png';
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
+                case 'Rpay':
+                    return '/static/images/royalpay_sign.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index d444fb858..55f608f1f 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -392,6 +392,8 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                     return '/static/images/jd_sign_lg.png';
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
+                case 'Rpay':
+                    return '/static/images/royalpay_sign.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index 05fd32c87..c9a2d092a 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -132,6 +132,19 @@
                 </div>
             </div>
         </div>
+        <div class="col-xs-4" ng-if="detail.RpayDetail">
+            <div class="info-box" style="background: lightcyan">
+                <div class="info-box-icon" style="    background: bottom;">
+                    <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                </div>
+                <div class="info-box-content">
+                    <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
+                    <h5>Commission: ${{detail.RpayDetail.total_prize}}</h5>
+                    <h5>Send: ${{detail.RpayDetail.send_prize}}</h5>
+                    <h5>Fund: ${{detail.RpayDetail.total_donation}}</h5>
+                </div>
+            </div>
+        </div>
     </div>
     <div class="box box-default" ng-if="!detail.no_record">
         <div class="box-header">Details<span class="text-danger">(Red Client Moniker means received from BD User who left company.)</span></div>
@@ -174,6 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/royalpay_sign.png">
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 1ab3492ee..3a8303211 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -107,6 +107,18 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-4" ng-if="report.RpayReport">
+                <div class="info-box" style="background: lightcyan">
+                    <div class="info-box-icon" style="    background: bottom;">
+                        <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                    </div>
+                    <div class="info-box-content">
+                        <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
+                        <h5>BD Total Send: ${{report.RpayReport.total_send_prize}}</h5>
+                        <h5>BD Total Fund: ${{report.RpayReport.total_donation}}</h5>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="box box-default">
             <div class="box-header">BD Commission</div>
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 8671dcfa1..c6dabc50d 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
@@ -40,6 +40,11 @@
                         <img src="/static/images/hf_sign_lg.png">
                     </a>
                 </li>
+                <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
+                    <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
+                        <img src="/static/images/royalpay_sign.png">
+                    </a>
+                </li>
             </ul>
         </div>
     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 7dc4e3a21..56b590d51 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -351,6 +351,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/royalpay_sign.png"
+                                         uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>
                                 <td>

From 158276ecffd532cf992abc647d021182dc28194d Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 19 Sep 2018 16:47:55 +0800
Subject: [PATCH 3/8] =?UTF-8?q?[fix]=E6=98=BE=E7=A4=BA=E6=80=BB=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E6=95=B0=EF=BC=8C=E5=8C=85=E6=8B=AC=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/core/impls/DashboardServiceImpl.java   |  5 ++++-
 .../analysis/mappers/ClientAnalysisMapper.java      |  3 +++
 .../analysis/mappers/ClientAnalysisMapper.xml       | 13 +++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
index 261626c82..ece285f7a 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
@@ -102,7 +102,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT
         }
         JSONObject res = new JSONObject();
         res.put("new_partners", clientAnalysisMapper.countNewClients(params));
-        res.put("total_partners", clientAnalysisMapper.countClients(params));
+
+        //res.put("total_partners", clientAnalysisMapper.countClients(params));
+        // 统计所有的商户，包括禁用的
+        res.put("total_partners", clientAnalysisMapper.countClientsAll(params));
         stringRedisTemplate.boundValueOps("org_commonAnalysis3"+params.getString("org_id")+params.getString("begin")).set(res.toJSONString(), 5, TimeUnit.MINUTES);
         return res;
     }
diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
index e74edaa7b..dd4272dd2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.java
@@ -22,6 +22,9 @@ public interface ClientAnalysisMapper {
 
     int countClients(JSONObject params);
 
+    // 统计所有的商户，包括禁用的
+    int countClientsAll(JSONObject params);
+
     @AutoSql(type = SqlType.COUNT)
     @AdvanceSelect(addonWhereClause = "sub_merchant_id is not null")
     int countTotalPartners();
diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
index c5462dae2..6afef4190 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml
@@ -40,6 +40,19 @@
         </if>
         GROUP BY a.datelist
     </select>
+    <!--显示所有的商户，包括禁用的-->
+    <select id="countClientsAll" resultType="java.lang.Integer">
+        <![CDATA[
+        SELECT count(client_id)
+        FROM sys_clients
+        WHERE
+            create_time <= #{end} and (approve_result is null or approve_result !=0)
+        ]]>
+        <if test="org_id!=null and org_ids==null">and org_id=#{org_id}</if>
+        <if test="org_ids!=null">and org_id in
+            <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
+    </select>
+
     <select id="countClients" resultType="java.lang.Integer">
         <![CDATA[
         SELECT count(client_id)

From 2dbe7e3b69aabf1acd455328acbdca9cadeeea14 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Wed, 19 Sep 2018 17:39:57 +0800
Subject: [PATCH 4/8] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0rpay+=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/analysis/clearing-log.js     |   4 ++--
 .../templates/settlement_transactions.html      |   4 ++--
 .../commons/services/clearingDetailService.js   |   4 ++--
 src/main/ui/static/config/bdprize/bdprize.js    |   4 ++--
 .../bdprize/templates/bd_prize_detail.html      |   4 ++--
 .../templates/bd_prize_month_report.html        |   2 +-
 src/main/ui/static/images/rpayplus.png          | Bin 0 -> 20524 bytes
 .../templates/partner_settlement_dialog.html    |   4 ++--
 .../payment/tradelog/templates/trade_logs.html  |   2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 src/main/ui/static/images/rpayplus.png

diff --git a/src/main/ui/static/analysis/clearing-log.js b/src/main/ui/static/analysis/clearing-log.js
index 9ecebf963..d77ea8380 100644
--- a/src/main/ui/static/analysis/clearing-log.js
+++ b/src/main/ui/static/analysis/clearing-log.js
@@ -533,7 +533,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
@@ -543,7 +543,7 @@ define(['angular', 'decimal', 'uiBootstrap', 'uiRouter', 'angularEcharts'], func
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
             }
         }
     });
diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index ddb451ebe..a305471a6 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -15,7 +15,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/royalpay_sign.png" class="channel-icon-lg">
+                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -50,7 +50,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="RPAY">
-                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
+                        <img src="/static/images/rpayplus.png" class="channel-icon-lg">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/commons/services/clearingDetailService.js b/src/main/ui/static/commons/services/clearingDetailService.js
index bcd54527e..73de796be 100644
--- a/src/main/ui/static/commons/services/clearingDetailService.js
+++ b/src/main/ui/static/commons/services/clearingDetailService.js
@@ -51,7 +51,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
@@ -61,7 +61,7 @@ define(['../app','decimal'], function (app,Decimal) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/bdprize.js b/src/main/ui/static/config/bdprize/bdprize.js
index 55f608f1f..d79cf24c4 100644
--- a/src/main/ui/static/config/bdprize/bdprize.js
+++ b/src/main/ui/static/config/bdprize/bdprize.js
@@ -383,7 +383,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'AlipayOnline':
                     return '/static/images/alipay_online.png';
                 case 'System':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
                 case 'Bestpay':
                     return '/static/images/bestpay_sign_lg.png';
                 case 'Wechat':
@@ -393,7 +393,7 @@ define(['angular', '../../analysis/bd/analysis-bd'], function (angular) {
                 case 'hf':
                     return '/static/images/hf_sign_lg.png';
                 case 'Rpay':
-                    return '/static/images/royalpay_sign.png';
+                    return '/static/images/rpayplus.png';
             }
         }
     });
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
index c9a2d092a..1e418ed94 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_detail.html
@@ -135,7 +135,7 @@
         <div class="col-xs-4" ng-if="detail.RpayDetail">
             <div class="info-box" style="background: lightcyan">
                 <div class="info-box-icon" style="    background: bottom;">
-                    <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                    <img uib-tooltip="HF" src="/static/images/rpayplus.png">
                 </div>
                 <div class="info-box-content">
                     <h5>Transaction: ${{detail.RpayDetail.total_amount}}</h5>
@@ -187,7 +187,7 @@
                         <img ng-if="log.channel=='Bestpay'" uib-tooltip="Bestpay" src="/static/images/bestpay_sign_lg.png">
                         <img ng-if="log.channel=='jd'" uib-tooltip="Bestpay" src="/static/images/jd_sign_lg.png">
                         <img ng-if="log.channel=='hf'" uib-tooltip="Bestpay" src="/static/images/hf_sign_lg.png">
-                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/royalpay_sign.png">
+                        <img ng-if="log.channel=='Rpay'" uib-tooltip="Rpay" src="/static/images/rpayplus.png">
                     </td>
                 </tr>
                 </tbody>
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 3a8303211..377e1386d 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -110,7 +110,7 @@
             <div class="col-xs-4" ng-if="report.RpayReport">
                 <div class="info-box" style="background: lightcyan">
                     <div class="info-box-icon" style="    background: bottom;">
-                        <img uib-tooltip="HF" src="/static/images/royalpay_sign.png">
+                        <img uib-tooltip="HF" src="/static/images/rpayplus.png">
                     </div>
                     <div class="info-box-content">
                         <h5>BD Total Commission: ${{report.RpayReport.total_prize}}</h5>
diff --git a/src/main/ui/static/images/rpayplus.png b/src/main/ui/static/images/rpayplus.png
new file mode 100644
index 0000000000000000000000000000000000000000..d23029388d467d5d7e99669b8352c52976e579cf
GIT binary patch
literal 20524
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

literal 0
HcmV?d00001

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 c6dabc50d..1d1f07f0e 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/royalpay_sign.png">
+                        <img src="/static/images/rpayplus.png">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">
@@ -42,7 +42,7 @@
                 </li>
                 <li ng-class="{active:ctrl.channel=='Rpay'}" ng-if="report.channels.Rpay">
                     <a role="button" ng-click="ctrl.channel='Rpay';channelAndDayOfAnalysis()" title="Rpay Pay">
-                        <img src="/static/images/royalpay_sign.png">
+                        <img src="/static/images/rpayplus.png">
                     </a>
                 </li>
             </ul>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 56b590d51..6b33eb04a 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -351,7 +351,7 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                    <img src="/static/images/royalpay_sign.png"
+                                    <img src="/static/images/rpayplus.png"
                                          uib-tooltip="Royal Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id}}
                                 </td>

From 5b26497cd843b1753c92cd0c935e1089aadcefc6 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 09:03:41 +0800
Subject: [PATCH 5/8] [fix]

---
 .../ui/static/analysis/templates/settlement_transactions.html   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/ui/static/analysis/templates/settlement_transactions.html b/src/main/ui/static/analysis/templates/settlement_transactions.html
index a305471a6..247848535 100644
--- a/src/main/ui/static/analysis/templates/settlement_transactions.html
+++ b/src/main/ui/static/analysis/templates/settlement_transactions.html
@@ -15,7 +15,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.png" class="channel-icon-lg">
+                        <img src="/static/images/royalpay_sign.png" class="channel-icon-lg">
                     </a>
                 </li>
                 <li ng-class="{active:ctrl.channel=='Wechat'}" ng-if="report.channels.Wechat">

From 535267fa96f6f3bb8e3e76af7605abb08ca78268 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 11:45:59 +0800
Subject: [PATCH 6/8] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0Rpay+=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/mappers/CustomerAndOrdersStatisticsMapper.xml   | 4 +++-
 src/main/ui/static/analysis/templates/customer_analysis.html | 2 ++
 src/main/ui/static/analysis/templates/trans_analysis.html    | 5 ++++-
 .../ui/static/analysis/templates/trans_analysis_monthly.html | 3 +++
 src/main/ui/static/commons/templates/order_detail.html       | 2 ++
 src/main/ui/static/invoice/templates/invoice_assistant.html  | 2 ++
 src/main/ui/static/payment/custom/templates/custom.html      | 2 ++
 src/main/ui/static/payment/invoice/templates/invoice.html    | 2 ++
 .../static/payment/partner/templates/partner_pay_logs.html   | 1 +
 .../ui/static/payment/tradelog/templates/balance_report.html | 2 ++
 .../payment/tradelog/templates/partner_trade_logs.html       | 1 +
 11 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
index 361c1769b..253dcc017 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/CustomerAndOrdersStatisticsMapper.xml
@@ -316,7 +316,9 @@
                 ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.total ELSE 0 END),0) alipayonlineamount,
                 ifnull(sum(CASE WHEN s.channel = 'AlipayOnline' THEN s.orders  ELSE 0 END),0) alipayonline_order_count,
                 ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.total ELSE 0 END),0) hfamount,
-                ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count
+                ifnull(sum(CASE WHEN s.channel = 'hf' THEN s.orders ELSE 0 END),0) hf_order_count,
+                ifnull(sum(CASE WHEN s.channel = 'Rpay' THEN s.total ELSE 0 END),0) rpayamount,
+                ifnull(sum(CASE WHEN s.channel = 'Rpay' THEN s.orders ELSE 0 END),0) rpay_order_count
         FROM statistics_customer_order s
         LEFT JOIN sys_clients c ON  c.client_id = s.client_id and c.is_valid=1
         ]]>
diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index d155affb3..1c54efb22 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -179,6 +179,8 @@
                                      uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                                <img src="/static/images/rpayplus.png"
+                                     uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
                             <td>{{order.short_name}}(<a class="text-primary" role="button" title="Detail"
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 17f6b602a..22bc4a6d2 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -216,9 +216,12 @@
                                 <th>
                                     <img src="/static/images/jd_sign.png"/>
                                     JD Pay:{{totalChannelAmount.jdPayAmount|currency: ' $ '}}</th>
+                                <th>
+                                    <img src="/static/images/rpayplus.png"/>
+                                    R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
-                                    JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
+                                    hf Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
                                 &lt;!&ndash;<th>&ndash;&gt;
                                     &lt;!&ndash;<img src="/static/images/wechatpay_sign.png"/>&ndash;&gt;
                                     &lt;!&ndash;Znyoo:{{totalChannelAmount.znyooAmount|currency: ' $ '}}</th>&ndash;&gt;
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index c507e7de6..858b8762c 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -178,6 +178,9 @@
                                 <th>
                                     <img src="/static/images/hf_sign.png"/>
                                     JD Pay:{{totalChannelAmount.hfPayAmount|currency: ' $ '}}</th>
+                                <th>
+                                    <img src="/static/images/rpayplus.png"/>
+                                    R Pay:{{totalChannelAmount.rpayamount|currency: ' $ '}}</th>
                             </tr>
                         </table>-->
                     </div>
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 748662a23..7b25d1a59 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -45,6 +45,8 @@
                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                            <img src="/static/images/rpayplus.png"
+                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
                         </p>
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index 43420b87c..136a5bdd0 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -206,6 +206,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 2a15a45f7..0bf23ead3 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -101,6 +101,8 @@
                                                  uib-tooltip="JD Pay" ng-if="order.channel=='jd'"/>
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
+                                            <img src="/static/images/rpayplus.png"
+                                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
                                     </p>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index cf06b87f7..266e8d661 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -200,6 +200,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 0055cf480..6bcad5c56 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -185,6 +185,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                        <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index e373aee29..352936b65 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -296,6 +296,8 @@
                                          uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                    <img src="/static/images/rpayplus.png"
+                                         uib-tooltip="RPay" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index e093dd66e..b31e11469 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -322,6 +322,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+                                     <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>

From dca2b18ea0a141615f7179c9575fbe45e6ee8b28 Mon Sep 17 00:00:00 2001
From: hellolujian <1370256381@qq.com>
Date: Thu, 20 Sep 2018 12:11:36 +0800
Subject: [PATCH 7/8] =?UTF-8?q?[fix]=E6=B7=BB=E5=8A=A0Rpay+=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../analysis/templates/trans_analysis.html      | 11 +++++++++++
 .../templates/trans_analysis_monthly.html       | 12 ++++++++++++
 .../static/dashboard/templates/dashboard.html   | 17 +++++++++++++++++
 3 files changed, 40 insertions(+)

diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 22bc4a6d2..57fd8db3f 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -197,6 +197,17 @@
                                     </div>
                                 </div>
                             </div>
+                            <!-- Rpay+显示交易额分析，先注释掉，日后可能需要显示
+                            <div class="col-sm-2 col-xs-6">
+                                <div class="description-block">
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-text text-red">
+                                        <label class="description-text"
+                                               ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                                    </div>
+                                </div>
+                            </div>
+                            -->
                         </div>
                         <!--<table class="table">
                             <tr>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index 858b8762c..be580aa13 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -157,6 +157,18 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <!-- 显示Rpay+交易额分析，先注释掉，日后可能需要显示
+                            <div class="col-sm-2 col-xs-6">
+                                <div class="description-block">
+                                    <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R Pay</div>
+                                    <div class="description-text">
+                                        <label class="description-text text-red"
+                                               ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                                    </div>
+                                </div>
+                            </div>
+                            -->
                         </div>
                       <!--  <table class="table">
                             <tr>
diff --git a/src/main/ui/static/dashboard/templates/dashboard.html b/src/main/ui/static/dashboard/templates/dashboard.html
index 73b1c3d38..55c56f2fa 100644
--- a/src/main/ui/static/dashboard/templates/dashboard.html
+++ b/src/main/ui/static/dashboard/templates/dashboard.html
@@ -159,6 +159,23 @@
                         <div class="description-header text-bold"><img src="/static/images/hf_sign.png"/>HF</div>
                     </div>
                 </div>
+
+                <!-- dashboard显示Rpay+交易额，先注释掉，日后可能需要显示
+                <div class="col-sm-4 col-xs-6">
+                    <div class="description-block">
+                        <div class="description-text">交易额:
+                            <label class="description-text text-red"
+                                   ng-bind="totalChannelAmount.rpayamount|currency: ' $ '"></label>
+                        </div>
+                        <div class="description-text">订单数:
+                            <label class="description-text text-red"
+                                   ng-bind="totalChannelAmount.rpay_order_count"></label>
+                        </div>
+                        <div class="description-header text-bold"><img src="/static/images/rpayplus.png"/>R</div>
+                    </div>
+                </div>
+                -->
+
             </div>
         </div>
     </div>

From 7ac83ccf01d48216347d2695b299d2407d005823 Mon Sep 17 00:00:00 2001
From: "taylor.dang" <taylor.dang@globalfreepay.com>
Date: Thu, 20 Sep 2018 13:18:15 +0800
Subject: [PATCH 8/8] rpay

---
 .../ui/static/analysis/templates/customer_analysis.html     | 2 +-
 .../static/analysis/templates/manage_customers_orders.html  | 4 +++-
 src/main/ui/static/analysis/templates/trans_analysis.html   | 4 +++-
 .../static/analysis/templates/trans_analysis_monthly.html   | 4 +++-
 .../analysis/templates/transaction_amount_Analysis.html     | 2 ++
 src/main/ui/static/commons/templates/order_detail.html      | 2 +-
 src/main/ui/static/invoice/templates/invoice_assistant.html | 2 +-
 src/main/ui/static/payment/custom/templates/custom.html     | 2 +-
 src/main/ui/static/payment/invoice/templates/invoice.html   | 2 +-
 .../static/payment/partner/templates/partner_pay_logs.html  | 6 ++++--
 .../static/payment/tradelog/templates/balance_report.html   | 6 +++---
 .../payment/tradelog/templates/partner_trade_logs.html      | 4 +++-
 .../ui/static/payment/tradelog/templates/trade_logs.html    | 4 +++-
 13 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/ui/static/analysis/templates/customer_analysis.html b/src/main/ui/static/analysis/templates/customer_analysis.html
index 1c54efb22..d28281419 100644
--- a/src/main/ui/static/analysis/templates/customer_analysis.html
+++ b/src/main/ui/static/analysis/templates/customer_analysis.html
@@ -180,7 +180,7 @@
                                 <img src="/static/images/hf_sign.png"
                                      uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                                 <img src="/static/images/rpayplus.png"
-                                     uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                     uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                 {{order.order_id}}
                             </td>
                             <td>{{order.short_name}}(<a class="text-primary" role="button" title="Detail"
diff --git a/src/main/ui/static/analysis/templates/manage_customers_orders.html b/src/main/ui/static/analysis/templates/manage_customers_orders.html
index a8531b7d3..735431137 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -90,7 +90,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis.html b/src/main/ui/static/analysis/templates/trans_analysis.html
index 57fd8db3f..67db5f858 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -97,7 +97,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
index be580aa13..0cae44777 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis_monthly.html
@@ -67,7 +67,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
                                                    ng-click="params.channel='jd';doAnalysis(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
-                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a>
+                                                   ng-click="params.channel='hf';doAnalysis(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';doAnalysis(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
index b23530dd5..f5fd6e838 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -32,6 +32,8 @@
                                                    ng-click="params.channel='jd';loadTradeLogs()">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='hf'}"
                                                    ng-click="params.channel='hf';loadTradeLogs()">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/commons/templates/order_detail.html b/src/main/ui/static/commons/templates/order_detail.html
index 7b25d1a59..3184f16b2 100644
--- a/src/main/ui/static/commons/templates/order_detail.html
+++ b/src/main/ui/static/commons/templates/order_detail.html
@@ -46,7 +46,7 @@
                             <img src="/static/images/hf_sign.png"
                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                             <img src="/static/images/rpayplus.png"
-                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                             {{order.order_id}}
                             </td>
                         </p>
diff --git a/src/main/ui/static/invoice/templates/invoice_assistant.html b/src/main/ui/static/invoice/templates/invoice_assistant.html
index 136a5bdd0..a477b413a 100644
--- a/src/main/ui/static/invoice/templates/invoice_assistant.html
+++ b/src/main/ui/static/invoice/templates/invoice_assistant.html
@@ -207,7 +207,7 @@
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus.png"
-                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/custom/templates/custom.html b/src/main/ui/static/payment/custom/templates/custom.html
index 0bf23ead3..c4b3299e2 100644
--- a/src/main/ui/static/payment/custom/templates/custom.html
+++ b/src/main/ui/static/payment/custom/templates/custom.html
@@ -102,7 +102,7 @@
                                             <img src="/static/images/hf_sign.png"
                                                  uib-tooltip="HF Pay" ng-if="order.channel=='hf'"/>
                                             <img src="/static/images/rpayplus.png"
-                                                 uib-tooltip="R Pay" ng-if="order.channel=='Rpay'"/>
+                                                 uib-tooltip="RPay+" ng-if="order.channel=='Rpay'"/>
                                             {{order.order_id}}
                                     </td>
                                     </p>
diff --git a/src/main/ui/static/payment/invoice/templates/invoice.html b/src/main/ui/static/payment/invoice/templates/invoice.html
index 266e8d661..6a49339c8 100644
--- a/src/main/ui/static/payment/invoice/templates/invoice.html
+++ b/src/main/ui/static/payment/invoice/templates/invoice.html
@@ -201,7 +201,7 @@
                                     <img src="/static/images/hf_sign.png"
                                          uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
                                     <img src="/static/images/rpayplus.png"
-                                         uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                         uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                     {{trade.order_id2}}
                                 </td>
                                 <td ng-bind="trade.currency"></td>
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 6bcad5c56..dd8618334 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -85,7 +85,9 @@
                         <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                            ng-click="params.channel='JD';loadTradeLogs(1)">JDpay</a> |
                         <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a>
+                           ng-click="params.channel='HF';loadTradeLogs(1)">HFpay</a> |
+                        <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                           ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                     </p>
                 </div>
             </div>
@@ -185,7 +187,7 @@
                         <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                         <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                         <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                        <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                        <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                         {{trade.order_id}}
                     </td>
                     <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index 352936b65..2ab2afc98 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -95,9 +95,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a><!--|
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='ZNYOO'}"
-                                                   ng-click="params.channel='ZNYOO';loadTradeLogs(1)">Znyoo</a>-->
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b31e11469..b63e52165 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -96,6 +96,8 @@
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
                                                    ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='Rpay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay+</a>
                                             </p>
                                         </div>
                                     </div>
@@ -322,7 +324,7 @@
                                      <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline" alt="AlipayOnline" ng-if="trade.channel=='AlipayOnline'"/>
                                      <img src="/static/images/jd_sign.png" uib-tooltip="JD Pay" ng-if="trade.channel=='jd'"/>
                                      <img src="/static/images/hf_sign.png" uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
-                                     <img src="/static/images/rpayplus.png" uib-tooltip="R Pay" ng-if="trade.channel=='Rpay'"/>
+                                     <img src="/static/images/rpayplus.png" uib-tooltip="RPay+" ng-if="trade.channel=='Rpay'"/>
                                      {{trade.order_id}}
                                  </td>
                                  <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 6b33eb04a..4a1d0ab54 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -133,7 +133,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
                                                    ng-click="params.channel='JD';loadTradeLogs(1)">JD Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='HF'}"
-                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a>
+                                                   ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPay'}"
+                                                   ng-click="params.channel='RPay';loadTradeLogs(1)">RPay +</a>
                                             </p>
                                         </div>
                                     </div>