diff --git a/pom.xml b/pom.xml
index b52068af7..2310c5c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>1.2.81</version>
+    <version>1.2.82</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>1.6.1</jib-maven-plugin.version>
diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
index 827cb9ec2..f2c40c9b2 100644
--- a/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
+++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/beans/TradeLogQuery.java
@@ -40,6 +40,16 @@ public class TradeLogQuery {
     private String org_id;
     private String org_id2;
 
+    public Integer getGatewayChild() {
+        return gatewayChild;
+    }
+
+    public void setGatewayChild(Integer gatewayChild) {
+        this.gatewayChild = gatewayChild;
+    }
+
+    private Integer gatewayChild;
+
     public JSONObject toParams(String timezone) {
         JSONObject params = new JSONObject();
         if (datefrom != null) {
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 b51ea893a..fd63dfd1e 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
@@ -151,6 +151,9 @@ public class TradeLogServiceImpl implements TradeLogService {
         if (manager != null && manager.getInteger("org_id") != null) {
             params.put("org_id", manager.getIntValue("org_id"));
         }
+        if(query.getGatewayChild()!=null){
+            params.put("trade_type",new ArrayList<Integer>(){{add(query.getGatewayChild());}});
+        }
         PageList<JSONObject> logs = orderMapper.listOrdersByClients(params,
                 new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
         if (timezone != null) {
@@ -184,6 +187,9 @@ public class TradeLogServiceImpl implements TradeLogService {
             }
         }
         orgManager.checkOrgIds(manager, params);
+        if(query.getGatewayChild()!=null){
+            params.put("trade_type",new ArrayList<Integer>(){{add(query.getGatewayChild());}});
+        }
         PageList<JSONObject> logs = orderMapper.listOrders(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc")));
         JSONObject result = PageListUtils.buildPageListResult(logs);
         JSONObject analysis = orderMapper.analysisOrders(params);
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js
index 85db1cb62..7021bc4e5 100644
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@@ -3351,6 +3351,28 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
             }
             params.page = page || $scope.pagination.page || 1;
+            if(params.gateway){
+                if((params.gateway.sort().toString()!=[0,1].toString()) && (params.gateway.sort().toString()!=[5,6].toString())){
+                    delete params.gatewayChilds;
+                    delete params.gatewayChild;
+                }
+                if(params.gatewayChilds){
+                    var exist = false
+                    params.gatewayChilds.forEach(function (child) {
+                        if(child==params.gatewayChild){
+                            exist = true
+                        }
+                    })
+                    if(!exist){
+                        params.gatewayChild = null
+                    }
+                }else{
+                    delete params.gatewayChild;
+                }
+            }else{
+                delete params.gatewayChilds;
+                delete params.gatewayChild;
+            }
             $http.get('/sys/partners/' + $scope.partner.client_moniker + '/trade_logs', {params: params}).then(function (resp) {
                 $scope.tradeLogs = resp.data.data;
                 $scope.pagination = resp.data.pagination;
@@ -3358,6 +3380,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             });
         };
 
+        $scope.initGatewayChild = function(){
+            $scope.params.gatewayChilds = $scope.params.gateway;
+            $scope.params.gatewayChild=null;
+            $scope.loadTradeLogs(1);
+        }
         $scope.gatewaySelected = function (arr) {
             return $scope.params.gateway != null && $scope.params.gateway.filter(function (gateway) {
                 return arr.indexOf(gateway) >= 0
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 7152f1475..c9d3dcb5c 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
@@ -42,9 +42,9 @@
                         <a role="button" ng-class="{'bg-primary':params.gateway==null}"
                            ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
-                           ng-click="params.gateway=[0,1];loadTradeLogs(1)">Retail In-Store</a> |
+                           ng-click="params.gateway=[0,1];initGatewayChild()">Retail In-Store</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
-                           ng-click="params.gateway=[5,6];loadTradeLogs(1)">Retail API</a> |
+                           ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}"
                            ng-click="params.gateway=[2,7];loadTradeLogs(1)">QR Code</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
@@ -68,6 +68,28 @@
                     </p>
                 </div>
             </div>
+            <div class="form-group col-xs-12"
+                 ng-if="params.gateway.sort().toString()==[0,1] || params.gateway.sort().toString()==[5,6]">
+                <label class="control-label col-xs-4 col-sm-2">Type of payment</label>
+                <div class="col-sm-10 col-xs-8">
+                    <p class="form-control-static">
+                        <a role="button" ng-class="{'bg-primary':params.gatewayChild==null}"
+                           ng-click="params.gatewayChild=null;loadTradeLogs(1)">All</a> |
+                        <a role="button" ng-if="params.gateway.sort().toString()==[0,1]"
+                           ng-class="{'bg-primary':params.gatewayChild==1}"
+                           ng-click="params.gatewayChild=1;loadTradeLogs(1)">线下B端二维码 |</a>
+                        <a role="button" ng-if="params.gateway.sort().toString()==[0,1]"
+                           ng-class="{'bg-primary':params.gatewayChild==0}"
+                           ng-click="params.gatewayChild=0;loadTradeLogs(1)">线下C端支付码</a>
+                        <a role="button" ng-if="params.gateway.sort().toString()==[5,6]"
+                           ng-class="{'bg-primary':params.gatewayChild==6}"
+                           ng-click="params.gatewayChild=6;loadTradeLogs(1)">线下网关(B端二维码) |</a>
+                        <a role="button" ng-if="params.gateway.sort().toString()==[5,6]"
+                           ng-class="{'bg-primary':params.gatewayChild==5}"
+                           ng-click="params.gatewayChild=5;loadTradeLogs(1)">线下网关(C端支付码)</a>
+                    </p>
+                </div>
+            </div>
             <div class="form-group col-xs-12">
                 <label class="control-label col-xs-4 col-sm-2">Channel</label>
                 <div class="col-sm-10 col-xs-8">
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 870e70a7a..8b1c3f72b 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
@@ -160,9 +160,9 @@
                                                 <a role="button" ng-class="{'bg-primary':params.gateway==null}"
                                                    ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
-                                                   ng-click="params.gateway=[0,1];loadTradeLogs(1)">Retail In-Store</a> |
+                                                   ng-click="params.gateway=[0,1];initGatewayChild()">Retail In-Store</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
-                                                   ng-click="params.gateway=[5,6];loadTradeLogs(1)">Retail API</a> |
+                                                   ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}"
                                                    ng-click="params.gateway=[2,7];loadTradeLogs(1)">QR Code</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
@@ -186,6 +186,28 @@
                                             </p>
                                         </div>
                                     </div>
+                                    <div class="form-group col-xs-12"
+                                         ng-if="params.gateway.sort().toString()==[0,1] || params.gateway.sort().toString()==[5,6]">
+                                        <label class="control-label col-xs-4 col-sm-2">Type of payment</label>
+                                        <div class="col-sm-10 col-xs-8">
+                                            <p class="form-control-static">
+                                                <a role="button" ng-class="{'bg-primary':params.gatewayChild==null}"
+                                                   ng-click="params.gatewayChild=null;loadTradeLogs(1)">All</a> |
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[0,1]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==1}"
+                                                   ng-click="params.gatewayChild=1;loadTradeLogs(1)">线下B端二维码 |</a>
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[0,1]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==0}"
+                                                   ng-click="params.gatewayChild=0;loadTradeLogs(1)">线下C端支付码</a>
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[5,6]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==6}"
+                                                   ng-click="params.gatewayChild=6;loadTradeLogs(1)">线下网关(B端二维码) |</a>
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[5,6]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==5}"
+                                                   ng-click="params.gatewayChild=5;loadTradeLogs(1)">线下网关(C端支付码)</a>
+                                            </p>
+                                        </div>
+                                    </div>
                                     <div class="form-group col-xs-12">
                                         <label class="control-label col-xs-4 col-sm-2">Date Range</label>
                                         <div class="col-sm-10 col-xs-8">
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 e51704979..5b33d2b14 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -1,26 +1,32 @@
 <style>
-    .box-icon_small{
+    .box-icon_small {
         width: 70px;
         height: 70px;
         font-size: 30px;
         line-height: 70px
     }
-    .info_box_bottom{
-        min-height:70px;
-        margin-bottom:0px
+
+    .info_box_bottom {
+        min-height: 70px;
+        margin-bottom: 0px
     }
-    .box-content_left{
-        margin-left:70px
+
+    .box-content_left {
+        margin-left: 70px
     }
-    .box-number_font{
-        font-size:14px
+
+    .box-number_font {
+        font-size: 14px
     }
-    .line_height{
+
+    .line_height {
         line-height: 14px
     }
-    .line_height_{
+
+    .line_height_ {
         line-height: 22px;
     }
+
     .col-xs-1-5,
     .col-sm-1-5,
     .col-md-1-5,
@@ -30,22 +36,26 @@
         padding-right: 10px;
         padding-left: 10px;
     }
+
     .col-xs-1-5 {
         width: 20%;
         float: left;
     }
+
     @media (min-width: 768px) {
         .col-sm-1-5 {
             width: 20%;
             float: left;
         }
     }
+
     @media (min-width: 992px) {
         .col-md-1-5 {
             width: 20%;
             float: left;
         }
     }
+
     @media (min-width: 1200px) {
         .col-lg-1-5 {
             width: 20%;
@@ -84,7 +94,8 @@
                                             </select>
                                         </label>
                                         <div class="col-sm-4 col-xs-8">
-                                            <input class="form-control" placeholder="Keyword" ng-enter="loadTradeLogs(1)"
+                                            <input class="form-control" placeholder="Keyword"
+                                                   ng-enter="loadTradeLogs(1)"
                                                    ng-model="params.searchText">
                                         </div>
 
@@ -97,7 +108,8 @@
                                                 </select>
                                             </div>
 
-                                            <div ng-if="((orgs_child.length > 1) && ('1000011'|withRole))&&params.org_id || ((orgs_child.length > 0) && ('1000000000000'|withRole))" class="col-sm-6">
+                                            <div ng-if="((orgs_child.length > 1) && ('1000011'|withRole))&&params.org_id || ((orgs_child.length > 0) && ('1000000000000'|withRole))"
+                                                 class="col-sm-6">
                                                 <select id="org-select" class="form-control" ng-model="params.org_id2"
                                                         ng-options="org.org_id as org.name group by org.org_type for org in orgs_child"
                                                         ng-change="loadTradeLogs(1)">
@@ -137,13 +149,19 @@
                                                 <a role="button" ng-class="{'bg-primary':params.status=='ALL'}"
                                                    ng-click="params.status='ALL';loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.status=='PAID'}"
-                                                   ng-click="params.status='PAID';loadTradeLogs(1)">Payment Success</a> |
+                                                   ng-click="params.status='PAID';loadTradeLogs(1)">Payment Success</a>
+                                                |
                                                 <a role="button" ng-class="{'bg-primary':params.status=='ALL_REFUNDED'}"
-                                                   ng-click="params.status='ALL_REFUNDED';loadTradeLogs(1)">All Refund</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.status=='PARTIAL_REFUNDED'}"
-                                                   ng-click="params.status='PARTIAL_REFUNDED';loadTradeLogs(1)">Partial Refund</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.status=='FULL_REFUNDED'}"
-                                                   ng-click="params.status='FULL_REFUNDED';loadTradeLogs(1)">Full Refund</a>
+                                                   ng-click="params.status='ALL_REFUNDED';loadTradeLogs(1)">All
+                                                    Refund</a> |
+                                                <a role="button"
+                                                   ng-class="{'bg-primary':params.status=='PARTIAL_REFUNDED'}"
+                                                   ng-click="params.status='PARTIAL_REFUNDED';loadTradeLogs(1)">Partial
+                                                    Refund</a> |
+                                                <a role="button"
+                                                   ng-class="{'bg-primary':params.status=='FULL_REFUNDED'}"
+                                                   ng-click="params.status='FULL_REFUNDED';loadTradeLogs(1)">Full
+                                                    Refund</a>
                                             </p>
                                         </div>
                                     </div>
@@ -157,8 +175,10 @@
                                                    ng-click="params.channel='WECHAT';loadTradeLogs(1)">Wechat Pay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='ALIPAY'}"
                                                    ng-click="params.channel='ALIPAY';loadTradeLogs(1)">Alipay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='ALIPAYONLINE'}"
-                                                   ng-click="params.channel='ALIPAYONLINE';loadTradeLogs(1)">AlipayOnline</a> |
+                                                <a role="button"
+                                                   ng-class="{'bg-primary':params.channel=='ALIPAYONLINE'}"
+                                                   ng-click="params.channel='ALIPAYONLINE';loadTradeLogs(1)">AlipayOnline</a>
+                                                |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='BESTPAY'}"
                                                    ng-click="params.channel='BESTPAY';loadTradeLogs(1)">BestPay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='JD'}"
@@ -181,9 +201,10 @@
                                                 <a role="button" ng-class="{'bg-primary':params.gateway==null}"
                                                    ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
-                                                   ng-click="params.gateway=[0,1];loadTradeLogs(1)">Retail In-Store</a> |
+                                                   ng-click="params.gateway=[0,1];initGatewayChild()">Retail In-Store</a>
+                                                |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
-                                                   ng-click="params.gateway=[5,6];loadTradeLogs(1)">Retail API</a> |
+                                                   ng-click="params.gateway=[5,6];loadTradeLogs(1);initGatewayChild()">Retail API</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}"
                                                    ng-click="params.gateway=[2,7];loadTradeLogs(1)">QR Code</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
@@ -193,7 +214,8 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
                                                    ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
-                                                   ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party Gateway</a> |
+                                                   ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party
+                                                    Gateway</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
                                                    ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@@ -207,19 +229,43 @@
                                             </p>
                                         </div>
                                     </div>
+                                    <div class="form-group col-xs-12"
+                                         ng-if="params.gateway.sort().toString()==[0,1] || params.gateway.sort().toString()==[5,6]">
+                                        <label class="control-label col-xs-4 col-sm-2">Type of payment</label>
+                                        <div class="col-sm-10 col-xs-8">
+                                            <p class="form-control-static">
+                                                <a role="button" ng-class="{'bg-primary':params.gatewayChild==null}"
+                                                   ng-click="params.gatewayChild=null;loadTradeLogs(1)">All</a> |
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[0,1]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==1}"
+                                                   ng-click="params.gatewayChild=1;loadTradeLogs(1)">线下B端二维码 |</a>
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[0,1]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==0}"
+                                                   ng-click="params.gatewayChild=0;loadTradeLogs(1)">线下C端支付码</a>
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[5,6]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==6}"
+                                                   ng-click="params.gatewayChild=6;loadTradeLogs(1)">线下网关(B端二维码) |</a>
+                                                <a role="button" ng-if="params.gateway.sort().toString()==[5,6]"
+                                                   ng-class="{'bg-primary':params.gatewayChild==5}"
+                                                   ng-click="params.gatewayChild=5;loadTradeLogs(1)">线下网关(C端支付码)</a>
+                                            </p>
+                                        </div>
+                                    </div>
                                     <div class="form-group col-xs-12">
                                         <label class="control-label col-xs-4 col-sm-2">Date Range</label>
                                         <div class="col-sm-10 col-xs-8">
                                             <div class="form-control-static form-inline">
                                                 <div style="display: inline-block">
-                                                    <input class="form-control" id="date-from-input" ng-model="params.datefrom"
+                                                    <input class="form-control" id="date-from-input"
+                                                           ng-model="params.datefrom"
                                                            uib-datepicker-popup size="10" placeholder="From"
                                                            is-open="dateBegin.open" ng-click="dateBegin.open=true"
                                                            datepicker-options="{maxDate:params.dateto||today}">
                                                 </div>
                                                 ~
                                                 <div style="display: inline-block">
-                                                    <input class="form-control" id="date-to-input" ng-model="params.dateto"
+                                                    <input class="form-control" id="date-to-input"
+                                                           ng-model="params.dateto"
                                                            uib-datepicker-popup size="10" placeholder="To"
                                                            is-open="dateTo.open" ng-click="dateTo.open=true"
                                                            datepicker-options="{minDate:params.datefrom,maxDate:today}">
@@ -238,10 +284,12 @@
                                                        ng-click="chooseLast7Days()">Last 7 Days</a>
                                                 </div>
                                                 <div class="btn-group">
-                                                    <a role="button" class="btn btn-default btn-sm" ng-click="thisMonth()">This Month</a>
+                                                    <a role="button" class="btn btn-default btn-sm"
+                                                       ng-click="thisMonth()">This Month</a>
                                                 </div>
                                                 <div class="btn-group">
-                                                    <a role="button" class="btn btn-default btn-sm" ng-click="lastMonth()">Last Month</a>
+                                                    <a role="button" class="btn btn-default btn-sm"
+                                                       ng-click="lastMonth()">Last Month</a>
                                                 </div>
                                             </div>
 
@@ -250,9 +298,12 @@
                                             <label class="control-label col-xs-4 col-sm-2">My Group</label>
                                             <div class="col-sm-10 col-xs-8">
                                                 <p class="form-control-static">
-                                                    <a role="button" ng-class="{'bg-primary':isAll}" ng-click="chooseBD('all')">All</a>
+                                                    <a role="button" ng-class="{'bg-primary':isAll}"
+                                                       ng-click="chooseBD('all')">All</a>
                                                     <label ng-repeat="sub in bd_group_bds">
-                                                        |&nbsp;<a role="button" ng-class="{'bg-primary':sub.manager_id==chooseBDId}" ng-click="chooseBD(sub.manager_id)">{{sub.bd_name}}</a>&nbsp;
+                                                        |&nbsp;<a role="button"
+                                                                  ng-class="{'bg-primary':sub.manager_id==chooseBDId}"
+                                                                  ng-click="chooseBD(sub.manager_id)">{{sub.bd_name}}</a>&nbsp;
                                                     </label>
                                                 </p>
                                             </div>
@@ -267,6 +318,7 @@
                                     <!--<i class="fa fa-wrench"></i> Audit Refund-->
                                     <!--</button>-->
                                     <!--</div>-->
+
                                 </div>
                             </div>
                         </div>
@@ -277,7 +329,8 @@
                         <div class="row">
                             <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
-                                    <span class="info-box-icon bg-aqua box-icon_small"><i class="ion ion-social-usd"></i></span>
+                                    <span class="info-box-icon bg-aqua box-icon_small"><i
+                                            class="ion ion-social-usd"></i></span>
                                     <div class="info-box-content box-content_left">
                                         <span class="info-box-text">Transaction Amount</span>
                                         <span class="info-box-number box-number_font"
@@ -288,7 +341,8 @@
                             </div>
                             <div class="col-md-1-5 col-sm-6 col-xs-12" ng-if="!analysis.cny_display_amount">
                                 <div class="info-box info_box_bottom">
-                                    <span class="info-box-icon bg-aqua box-icon_small"><i class="ion ion-social-usd"></i></span>
+                                    <span class="info-box-icon bg-aqua box-icon_small"><i
+                                            class="ion ion-social-usd"></i></span>
                                     <div class="info-box-content box-content_left">
                                         <span class="info-box-text">Input Amount</span>
                                         <span class="info-box-number box-number_font"
@@ -298,19 +352,24 @@
                                 </div>
                             </div>
                             <div class="col-md-1-5 col-sm-6 col-xs-12" ng-if="analysis.cny_display_amount">
-                                <div class="info-box info_box_bottom" ng-class="{'line_height':analysis.pre_display_amount||analysis.pre_cny_display_amount}">
-                                    <span class="info-box-icon bg-aqua box-icon_small"><i class="ion ion-social-usd"></i></span>
+                                <div class="info-box info_box_bottom"
+                                     ng-class="{'line_height':analysis.pre_display_amount||analysis.pre_cny_display_amount}">
+                                    <span class="info-box-icon bg-aqua box-icon_small"><i
+                                            class="ion ion-social-usd"></i></span>
                                     <div class="info-box-content box-content_left">
-                                        <span class="info-box-text" >Input Amount</span>
-                                        <span class="info-box-number box-number_font" style="margin-bottom: -3px;" ng-class="{line_height_:!analysis.pre_display_amount}"
+                                        <span class="info-box-text">Input Amount</span>
+                                        <span class="info-box-number box-number_font" style="margin-bottom: -3px;"
+                                              ng-class="{line_height_:!analysis.pre_display_amount}"
                                               ng-bind="analysis.display_amount|currency:'AUD '"></span>
-                                        <span style="font-size: 8px;line-height: 8px" ng-if="analysis.pre_display_amount">
+                                        <span style="font-size: 8px;line-height: 8px"
+                                              ng-if="analysis.pre_display_amount">
                                             ( {{analysis.pre_display_amount | currency:'pre authorization '}} )
                                         </span>
                                         <span class="info-box-number box-number_font" style="margin-bottom: -3px;"
                                               ng-if="analysis.cny_display_amount"
                                               ng-bind="analysis.cny_display_amount|currency:'CNY '"></span>
-                                        <span style="font-size: 8px;line-height: 8px" ng-if="analysis.pre_cny_display_amount">
+                                        <span style="font-size: 8px;line-height: 8px"
+                                              ng-if="analysis.pre_cny_display_amount">
                                             ( {{analysis.pre_cny_display_amount | currency:'pre authorization '}} )
                                         </span>
                                     </div>
@@ -318,7 +377,8 @@
                             </div>
                             <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
-                                    <span class="info-box-icon bg-red box-icon_small"><i class="ion ion-android-warning"></i></span>
+                                    <span class="info-box-icon bg-red box-icon_small"><i
+                                            class="ion ion-android-warning"></i></span>
                                     <div class="info-box-content box-content_left">
                                         <span class="info-box-text">Refund Amount</span>
                                         <span class="info-box-number box-number_font"
@@ -331,7 +391,8 @@
                             </div>
                             <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
-                                    <span class="info-box-icon bg-yellow box-icon_small"><i class="ion ion-ios-people"></i></span>
+                                    <span class="info-box-icon bg-yellow box-icon_small"><i
+                                            class="ion ion-ios-people"></i></span>
                                     <div class="info-box-content box-content_left">
                                         <span class="info-box-text">Merchants</span>
                                         <span class="info-box-number box-number_font"
@@ -342,7 +403,8 @@
                             </div>
                             <div class="col-md-1-5 col-sm-6 col-xs-12">
                                 <div class="info-box info_box_bottom">
-                                    <span class="info-box-icon bg-yellow box-icon_small"><i class="ion ion-ios-people"></i></span>
+                                    <span class="info-box-icon bg-yellow box-icon_small"><i
+                                            class="ion ion-ios-people"></i></span>
                                     <div class="info-box-content box-content_left">
                                         <span class="info-box-text">CUSTOMERS</span>
                                         <span class="info-box-number box-number_font"
@@ -356,7 +418,9 @@
                 <div class="box">
                     <div class="box-header">
                         <h3 class="box-title" style="display: inherit">Trade Orders
-                            <span style="float: right;font-size: 14px;">Pre Authorization:<i class="fa fa-stop" aria-hidden="true" style="color: #fff2a5"></i></span>
+                            <span style="float: right;font-size: 14px;">Pre Authorization:<i class="fa fa-stop"
+                                                                                             aria-hidden="true"
+                                                                                             style="color: #fff2a5"></i></span>
                         </h3>
                         <a hidden class="pull-right text-bold" ng-if="'manual_refund_check'|withFunc" role="button"
                            ng-click="confirmOrders()">Manual Confirm Orders</a>
@@ -415,8 +479,9 @@
                                 <td ng-bind="trade.display_amount|currency:trade.currency"></td>
                                 <td ng-bind="trade.clearing_amount|currency:'AUD'"></td>
                                 <td>
-                                    <span ng-if="(trade.channel!='hf')  &&  (trade.channel!='Rpay')" ng-bind="trade.exchange_rate"></span>
-                                    <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')" > - </span>
+                                    <span ng-if="(trade.channel!='hf')  &&  (trade.channel!='Rpay')"
+                                          ng-bind="trade.exchange_rate"></span>
+                                    <span ng-if="(trade.channel=='hf') || (trade.channel=='Rpay')"> - </span>
                                 </td>
                                 <td ng-bind="trade.status|tradeStatus"></td>
                                 <td ng-bind="trade.create_time"></td>
@@ -425,7 +490,9 @@
                                     <a role="button" class="text-bold" ng-click="showTradeDetail(trade)" title="Detail">
                                         <i class="fa fa-list-alt"></i>
                                     </a>
-                                    <a role="button" ng-if="trade.status>=5 && trade.confirm_time!=null && trade.clearing_status<2 && ('do_refund'|withFunc)" title="Refund"
+                                    <a role="button"
+                                       ng-if="trade.status>=5 && trade.confirm_time!=null && trade.clearing_status<2 && ('do_refund'|withFunc)"
+                                       title="Refund"
                                        class="text-bold text-danger" ng-click="newRefund(trade.order_id)">
                                         <i class="fa fa-undo"></i>
                                     </a>
@@ -448,7 +515,9 @@
                                         first-text="&laquo;"
                                         last-text="&raquo;"></uib-pagination>
                         <div class="row">
-                            <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
+                            <div class="col-xs-12">Total Records:{{pagination.totalCount}};Total
+                                Pages:{{pagination.totalPages}}
+                            </div>
                         </div>
                     </div>
                 </div>
diff --git a/src/main/ui/static/payment/tradelog/tradelog-manage.js b/src/main/ui/static/payment/tradelog/tradelog-manage.js
index 24f71dfb5..77b5e54e7 100644
--- a/src/main/ui/static/payment/tradelog/tradelog-manage.js
+++ b/src/main/ui/static/payment/tradelog/tradelog-manage.js
@@ -103,6 +103,28 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
                 }
                 params.page = page || $scope.pagination.page || 1;
+                if(params.gateway){
+                    if((params.gateway.sort().toString()!=[0,1].toString()) && (params.gateway.sort().toString()!=[5,6].toString())){
+                        delete params.gatewayChilds;
+                        delete params.gatewayChild;
+                    }
+                    if(params.gatewayChilds){
+                        var exist = false
+                        params.gatewayChilds.forEach(function (child) {
+                            if(child==params.gatewayChild){
+                                exist = true
+                            }
+                        })
+                        if(!exist){
+                            params.gatewayChild = null
+                        }
+                    }else{
+                        delete params.gatewayChild;
+                    }
+                }else{
+                    delete params.gatewayChilds;
+                    delete params.gatewayChild;
+                }
                 $http.get('/sys/trade_logs', {params: params}).then(function (resp) {
                     $scope.tradeLogs = resp.data.data;
                     $scope.pagination = resp.data.pagination;
@@ -118,6 +140,12 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     return arr.indexOf(gateway) >= 0
                 }).length > 0
             };
+
+            $scope.initGatewayChild = function(){
+                $scope.params.gatewayChilds = $scope.params.gateway;
+                $scope.params.gatewayChild=null;
+                $scope.loadTradeLogs(1);
+            }
             $scope.showTradeDetail = function (order) {
                 orderService.managerOrderDetail(order)
             };
diff --git a/src/main/ui/static/payment/tradelog/tradelog.js b/src/main/ui/static/payment/tradelog/tradelog.js
index a2b320587..710c2c71a 100644
--- a/src/main/ui/static/payment/tradelog/tradelog.js
+++ b/src/main/ui/static/payment/tradelog/tradelog.js
@@ -68,6 +68,28 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                     params.dateto = $filter('date')(params.dateto, 'yyyyMMdd');
                 }
                 params.page = page || $scope.pagination.page || 1;
+                if(params.gateway){
+                    if((params.gateway.sort().toString()!=[0,1].toString()) && (params.gateway.sort().toString()!=[5,6].toString())){
+                        delete params.gatewayChilds;
+                        delete params.gatewayChild;
+                    }
+                    if(params.gatewayChilds){
+                        var exist = false
+                        params.gatewayChilds.forEach(function (child) {
+                            if(child==params.gatewayChild){
+                                exist = true
+                            }
+                        })
+                        if(!exist){
+                            params.gatewayChild = null
+                        }
+                    }else{
+                        delete params.gatewayChild;
+                    }
+                }else{
+                    delete params.gatewayChilds;
+                    delete params.gatewayChild;
+                }
                 $http.get('/client/partner_info/trade_logs', {params: params}).then(function (resp) {
                     $scope.tradeLogs = resp.data.data;
                     $scope.pagination = resp.data.pagination;
@@ -81,6 +103,11 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
                         return arr.indexOf(gateway) >= 0
                     }).length > 0
             };
+            $scope.initGatewayChild = function(){
+                $scope.params.gatewayChilds = $scope.params.gateway;
+                $scope.params.gatewayChild=null;
+                $scope.loadTradeLogs(1);
+            }
             $scope.showTradeDetail = function (order) {
                 orderService.clientOrderDetail(order)
             };