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 fc527e582..1c38e76fd 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
@@ -41,7 +41,8 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
         listChannel.add(putParam(params,"Wechat"));
         listChannel.add(putParam(params,"Alipay"));
         listChannel.add(putParam(params,"AlipayOnline"));
-        listChannel.add(putParam(params,"AlipayAps"));
+        listChannel.add(putParam(params,"ApsInStore"));
+        listChannel.add(putParam(params,"ApsCashier"));
         listChannel.add(putParam(params,"Rpay"));
         listChannel.add(putParam(params,"rpaypmt_card"));
         listChannel.add(putParam(params,"rpaypmt_dd"));
@@ -55,7 +56,7 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
         }
         List<JSONObject> list = new ArrayList<>();
         Map<Date,JSONObject> analysisMap = new TreeMap<>();
-        String[] channels = {"Wechat","Alipay","AlipayOnline","Rpay","rpaypmt_card","rpaypmt_dd","AlipayAps"};
+        String[] channels = {"Wechat","Alipay","AlipayOnline","Rpay","rpaypmt_card","rpaypmt_dd","ApsCashier","ApsInStore"};
         for (String channel:channels){
             analysisChannelCustomers(params, analysisMap, channel);
         }
@@ -142,7 +143,10 @@ public class ChannelsAnalysisServiceImpl implements ChannelsAnalysisService {
             enablePartners = customerAndOrdersStatisticsMapper.countEnableChannel(params);
             params.remove("gateway_alipay_online");
         }
-        else if("AlipayAps".equals(name)){
+        else if("ApsInStore".equals(name)){
+            enablePartners=mchChannelContractMapper.sumEnablePartners(name);
+        }
+        else if("ApsCashier".equals(name)){
             enablePartners=mchChannelContractMapper.sumEnablePartners(name);
         }
         else {
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
index 2c034cf31..3b2640be1 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@@ -992,9 +992,6 @@ public class RetailAppServiceImp implements RetailAppService {
                  tradeDate = DateFormatUtils.format(calendar, "yyyy-MM-dd", calendar.getTimeZone());
                  tradeTime = DateFormatUtils.format(calendar, "HH:mm:ss", calendar.getTimeZone());
             }
-            if("AlipayAps".equalsIgnoreCase(order.getString("channel"))){
-                order.put("channel","Alipay+");
-            }
             order.put("trade_date", tradeDate);
             order.put("trade_time", tradeTime);
             // todo
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3abe3e0d0..82aa7edc2 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -7,11 +7,11 @@ spring:
       schema-name: royalpay
       username: rpaydev
     slave:
-      host: 192.168.0.84:3306
+      host: 192.168.0.92:3306
       jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-      password: rpayplus123
+      password: SuTUUxyvzS0cLETi6Rzm
       schema-name: royalpay
-      username: root
+      username: rpaydev
     type: com.zaxxer.hikari.HikariDataSource
 #spring:
 #  datasource:
@@ -22,12 +22,11 @@ spring:
 #      schema-name: royalpay
 #      password: SuTUUxyvzS0cLETi6Rzm
 #    slave:
-#      host: 192.168.0.84:3306
-#      jdbc-url: jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
-#      password: rpayplus123
+#      host: office.geekforbest.com:33306
+#      jdbc-url: jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+#      username: rpaydev_out
 #      schema-name: royalpay
-#      username: root
-#    type: com.zaxxer.hikari.HikariDataSource
+#      password: SuTUUxyvzS0cLETi6Rzm
 
 
 #spring:
@@ -60,24 +59,24 @@ spring:
 #      schema-name: royalpay_production
 #      username: readonly
 #    type: com.zaxxer.hikari.HikariDataSource
-  redis:
-    database: 1
-    host: 127.0.0.1
-    port: 6379
 #  redis:
 #    database: 1
-#    host: 192.168.0.84
+#    host: 127.0.0.1
 #    port: 6379
+  redis:
+    database: 1
+    host: 192.168.0.84
+    port: 6379
   mail:
     host: smtp.exmail.qq.com
     port: 465
 app:
   run-tasks: false
   host:
-    main: http://192.168.0.14:8888/
+    main: http://dalong-au.dev.rpaygroup.com/
     regions:
-      au: http://192.168.0.14:8888/
-      cn: http://192.168.0.14:8888/
+      au: http://dalong-au.dev.rpaygroup.com/
+      cn: http://dalong-au.dev.rpaygroup.com/
   mail:
     appid: 1
     host: https://dev.mailsupport.hcqtech.com
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 c7c28353b..dea1108de 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
@@ -344,9 +344,12 @@
                 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(COUNT(DISTINCT s.client_id,IF(s.channel = 'AlipayOnline',TRUE,NULL)),0) alipayonline_client_count,
-                ifnull(sum(CASE WHEN s.channel = 'AlipayAps' THEN s.total ELSE 0 END),0) alipayapsamount,
-                ifnull(sum(CASE WHEN s.channel = 'AlipayAps' THEN s.orders  ELSE 0 END),0) alipayaps_order_count,
-                ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'AlipayAps',TRUE,NULL)),0) alipayaps_client_count,
+                ifnull(sum(CASE WHEN s.channel = 'ApsInStore' THEN s.total ELSE 0 END),0) apsinstoreamount,
+                ifnull(sum(CASE WHEN s.channel = 'ApsInStore' THEN s.orders  ELSE 0 END),0) apsinstore_order_count,
+                ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'ApsInStore',TRUE,NULL)),0) apsinstore_client_count,
+                ifnull(sum(CASE WHEN s.channel = 'ApsCashier' THEN s.total ELSE 0 END),0) apscashieramount,
+                ifnull(sum(CASE WHEN s.channel = 'ApsCashier' THEN s.orders  ELSE 0 END),0) apscashier_order_count,
+                ifnull(COUNT(DISTINCT s.client_id,IF(s.channel = 'ApsCashier',TRUE,NULL)),0) apscashier_client_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(COUNT(DISTINCT s.client_id,IF(s.channel = 'hf',TRUE,NULL)),0) hf_client_count,
diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js
index e2f138993..8f00f77fb 100644
--- a/src/main/ui/static/analysis/channels_analysis.js
+++ b/src/main/ui/static/analysis/channels_analysis.js
@@ -173,7 +173,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                     trigger: 'axis'
                 },
                 legend: {
-                    data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额","HF Pay交易金额","Yeepay交易金额","LakalaPay交易金额","Card Payment交易金额","Direct Debit交易金额","Alipay+交易金额"],
+                    data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额","HF Pay交易金额","Yeepay交易金额","LakalaPay交易金额","Card Payment交易金额","Direct Debit交易金额","Alipay+交易金额","Alipay+(Online)交易金额"],
                     bottom: 0,
                     height: '15%',
                     width: '80%',
@@ -311,7 +311,18 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                         showSymbol: true,
                         yAxisIndex: 0
                     },
-                    column: {key: 'AlipayAps.total'}
+                    column: {key: 'ApsInStore.total'}
+                },
+                {
+                    basic: {
+                        name: 'Alipay+(Online)交易金额',
+                        type: 'line',
+                        label: {normal: {show: true}},
+                        showAllSymbols: true,
+                        showSymbol: true,
+                        yAxisIndex: 0
+                    },
+                    column: {key: 'ApsCashier.total'}
                 }
             ]
         };
@@ -322,7 +333,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                     trigger: 'axis'
                 },
                 legend: {
-                    data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单","HF Pay交易订单","Yeepay交易订单","LakalaPay交易订单","Card Payment交易订单","Direct Debit交易订单","Alipay+交易订单"],
+                    data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单","HF Pay交易订单","Yeepay交易订单","LakalaPay交易订单","Card Payment交易订单","Direct Debit交易订单","Alipay+交易订单","Alipay+(Online)交易订单"],
                     bottom: 0,
                     height: '15%',
                     width: '80%',
@@ -460,7 +471,18 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                         showSymbol: true,
                         yAxisIndex: 0
                     },
-                    column: {key: 'AlipayAps.orders'}
+                    column: {key: 'ApsInStore.orders'}
+                },
+                {
+                    basic: {
+                        name: 'Alipay+(Online)交易订单',
+                        type: 'line',
+                        label: {normal: {show: true}},
+                        showAllSymbols: true,
+                        showSymbol: true,
+                        yAxisIndex: 0
+                    },
+                    column: {key: 'ApsCashier.orders'}
                 }
             ]
         };
@@ -470,7 +492,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                     trigger: 'axis'
                 },
                 legend: {
-                    data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价","HF Pay交易客单价","Yeepay交易客单价","LakalaPay交易客单价","Card Payment交易客单价","Direct Debit交易客单价","Alipay+交易客单价"],
+                    data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价","HF Pay交易客单价","Yeepay交易客单价","LakalaPay交易客单价","Card Payment交易客单价","Direct Debit交易客单价","Alipay+交易客单价","Alipay+(Online)交易客单价"],
                     bottom: 0,
                 },
                 yAxis: [
@@ -605,7 +627,18 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
                         showSymbol: true,
                         yAxisIndex: 0
                     },
-                    column: {key: 'AlipayAps.single_amount'}
+                    column: {key: 'ApsInStore.single_amount'}
+                },
+                {
+                    basic: {
+                        name: 'Alipay+(Online)交易客单价',
+                        type: 'line',
+                        label: {normal: {show: true}},
+                        showAllSymbols: true,
+                        showSymbol: true,
+                        yAxisIndex: 0
+                    },
+                    column: {key: 'ApsCashier.single_amount'}
                 }
             ]
         };
diff --git a/src/main/ui/static/analysis/templates/channels_analysis.html b/src/main/ui/static/analysis/templates/channels_analysis.html
index 3303d188d..021044d45 100644
--- a/src/main/ui/static/analysis/templates/channels_analysis.html
+++ b/src/main/ui/static/analysis/templates/channels_analysis.html
@@ -140,10 +140,12 @@
                                         </thead>
                                         <tbody>
                                         <tr ng-repeat="channels in countChannels |orderBy:'total':true">
-                                            <td style="text-align: center;font-style: italic;font-size: larger" ng-if="channels.channel!='AlipayAps'"
+                                            <td style="text-align: center;font-style: italic;font-size: larger" ng-if="channels.channel!='ApsCashier'&&channels.channel!='ApsInStore'"
                                                 ng-bind="channels.channel"></td>
-                                            <td style="text-align: center;font-style: italic;font-size: larger"  ng-if="channels.channel=='AlipayAps'"
+                                            <td style="text-align: center;font-style: italic;font-size: larger"  ng-if="channels.channel=='ApsInStore'"
                                                 >Alipay+</td>
+                                            <td style="text-align: center;font-style: italic;font-size: larger"  ng-if="channels.channel=='ApsCashier'"
+                                                >Alipay+(Online)</td>
                                             <td ng-bind="channels.total"></td>
                                             <td ng-bind="channels.order"></td>
                                             <td ng-bind="channels.transaction_partners"></td>
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 f7477b847..db3d77c35 100644
--- a/src/main/ui/static/analysis/templates/manage_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/manage_customers_orders.html
@@ -85,24 +85,18 @@ Ye<style>
                                                    ng-click="params.channel='ALIPAY';doAnalysis(1)">Alipay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='AlipayOnline'}"
                                                    ng-click="params.channel='AlipayOnline';doAnalysis(1)">AlipayOnline</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='AlipayAps'}"
-                                                   ng-click="params.channel='AlipayAps';doAnalysis(1)">Alipay+</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='BESTPAY'}"
-                                                   ng-click="params.channel='BESTPAY';doAnalysis(1)">BestPay</a> |
-                                                <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> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';doAnalysis(1)">Alipay+</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';doAnalysis(1)">Alipay+(Online)</a> |
+
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='Yeepay'}"
-                                                   ng-click="params.channel='YEEPAY';doAnalysis(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LakalaPay'}"
-                                                   ng-click="params.channel='LAKALAPAY';doAnalysis(1)">LakalaPay</a> |
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';doAnalysis(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/partner_customers_orders.html b/src/main/ui/static/analysis/templates/partner_customers_orders.html
index cf8e1ccf7..4dd6c3249 100644
--- a/src/main/ui/static/analysis/templates/partner_customers_orders.html
+++ b/src/main/ui/static/analysis/templates/partner_customers_orders.html
@@ -95,24 +95,16 @@
                                                    ng-click="params.channel='ALIPAY';doAnalysis(1)">Alipay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='AlipayOnline'}"
                                                    ng-click="params.channel='AlipayOnline';doAnalysis(1)">AlipayOnline</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='AlipayAps'}"
-                                                   ng-click="params.channel='AlipayAps';doAnalysis(1)">Alipay+</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='BESTPAY'}"
-                                                   ng-click="params.channel='BESTPAY';doAnalysis(1)">BestPay</a> |
-                                                <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>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';doAnalysis(1)">Alipay+</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';doAnalysis(1)">Alipay+(Online)</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                                                   ng-click="params.channel='YEEPAY';doAnalysis(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LakalaPay'}"
-                                                   ng-click="params.channel='LAKALAPAY';doAnalysis(1)">LakalaPay</a> |
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';doAnalysis(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/analysis/templates/partner_trans_analysis.html b/src/main/ui/static/analysis/templates/partner_trans_analysis.html
index f175a8227..718eb47c1 100644
--- a/src/main/ui/static/analysis/templates/partner_trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/partner_trans_analysis.html
@@ -95,22 +95,14 @@
                                                    ng-click="params.channel='ALIPAY';doAnalysis(1)">Alipay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='AlipayOnline'}"
                                                    ng-click="params.channel='AlipayOnline';doAnalysis(1)">AlipayOnline</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='AlipayAps'}"
-                                                   ng-click="params.channel='AlipayAps';doAnalysis(1)">Alipay+</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='BESTPAY'}"
-                                                   ng-click="params.channel='BESTPAY';doAnalysis(1)">BestPay</a> |
-                                                <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> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                                                   ng-click="params.channel='YEEPAY';doAnalysis(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LAKALAPAY'}"
-                                                   ng-click="params.channel='LAKALAPAY';doAnalysis(1)">LakalaPay</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';doAnalysis(1)">Alipay+</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';doAnalysis(1)">Alipay+(Online)</a> |
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';doAnalysis(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</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 747ae56ea..21e386d5d 100644
--- a/src/main/ui/static/analysis/templates/trans_analysis.html
+++ b/src/main/ui/static/analysis/templates/trans_analysis.html
@@ -97,24 +97,15 @@
                                                    ng-click="params.channel='ALIPAY';doAnalysis(1)">Alipay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='AlipayOnline'}"
                                                    ng-click="params.channel='AlipayOnline';doAnalysis(1)">AlipayOnline</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='AlipayAps'}"
-                                                   ng-click="params.channel='AlipayAps';doAnalysis(1)">Alipay+</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='BESTPAY'}"
-                                                   ng-click="params.channel='BESTPAY';doAnalysis(1)">BestPay</a> |
-                                                <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> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';doAnalysis(1)">Alipay+</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';doAnalysis(1)">Alipay+(Online)</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';doAnalysis(1)">RPay +</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                                                   ng-click="params.channel='YEEPAY';doAnalysis(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LAKALAPAY'}"
-                                                   ng-click="params.channel='LAKALAPAY';doAnalysis(1)">LakalaPay</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';doAnalysis(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
@@ -173,18 +164,7 @@
 
                                 </div>
                             </div>
-                            <div class="col-sm-2 col-xs-6">
-                                <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/bestpay_sign.png"/>Bestpay</div>
-                                    <div class="description-text">
-                                        <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.bestpayamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.bestpay_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.bestpay_client_count }}</label>
-                                    </div>
 
-                                </div>
-                            </div>
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
                                     <div class="description-header text-bold"><img src="/static/images/alipay_sign.png"/>Alipay</div>
@@ -209,32 +189,7 @@
 
                                 </div>
                             </div>
-                            <div class="col-sm-2 col-xs-6">
-                                <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/jd_sign.png"/>JD Pay</div>
-                                    <div class="description-text">
-                                        <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.jdamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.jd_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.jd_client_count }}</label>
-                                    </div>
-
-                                </div>
-                            </div>
-                            <div class="col-sm-2 col-xs-6">
-                                <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/hf_sign.png"/>HF Pay</div>
-                                    <div class="description-text">
-                                        <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.hfamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.hf_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.hf_client_count }}</label>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
 
-                        <div class="row">
                             <!-- 显示Rpay+交易额分析-->
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
@@ -247,28 +202,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-sm-2 col-xs-6">
-                                <div class="description-block">
-                                    <div class="description-header text-bold"><img src="/static/images/yeepay_sign.png"/>Yeepay</div>
-                                    <div class="description-text">
-                                        <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.yeepayamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.yeepay_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.yeepay_client_count }}</label>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-2 col-xs-6">
-                                <div class="description-block">
-                                    <div class="description-header text-bold"><small><img src="/static/images/lakalapay_sign.png"/>LakalaPay</small></div>
-                                    <div class="description-text">
-                                        <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.lakalapayamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.lakala_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.lakala_client_count }}</label>
-                                    </div>
-                                </div>
-                            </div>
+
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
                                     <div class="description-header text-bold"><small><img src="/static/images/card_payment_sign.png"/>Card Payment</small></div>
@@ -280,25 +214,31 @@
                                     </div>
                                 </div>
                             </div>
+                        </div>
+
+                        <div class="row">
+
+
+
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><small><img src="/static/images/direct_debit_sign.png"/>Direct Debit</small></div>
+                                    <div class="description-header text-bold"><small><img src="/static/images/alipay_aps.jpg" style="height: 30px"/>Alipay+</small></div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.rpaypmt_ddamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.rpaypmt_dd_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.rpaypmt_dd_client_count }}</label>
+                                               ng-bind="totalChannelAmount.apsinstoreamount|currency: ' $ '"></label></br>
+                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.apsinstore_order_count }}</label>
+                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.apsinstore_client_count }}</label>
                                     </div>
                                 </div>
                             </div>
                             <div class="col-sm-2 col-xs-6">
                                 <div class="description-block">
-                                    <div class="description-header text-bold"><small><img src="/static/images/alipay_aps.jpg" style="height: 30px"/>Alipay+</small></div>
+                                    <div class="description-header text-bold"><small><img src="/static/images/alipay_aps.jpg" style="height: 30px"/>Alipay+(Online)</small></div>
                                     <div class="description-text">
                                         <label class="description-text text-red"
-                                               ng-bind="totalChannelAmount.alipayapsamount|currency: ' $ '"></label></br>
-                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.alipayaps_order_count }}</label>
-                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.alipayaps_client_count }}</label>
+                                               ng-bind="totalChannelAmount.apscashieramount|currency: ' $ '"></label></br>
+                                        <label class="description-text text-red">交易笔数：{{ totalChannelAmount.apscashier_order_count }}</label>
+                                        <label class="description-text text-red">交易商户数：{{ totalChannelAmount.apscashier_client_count }}</label>
                                     </div>
                                 </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 402f37ff1..66ccd0791 100644
--- a/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
+++ b/src/main/ui/static/analysis/templates/transaction_amount_Analysis.html
@@ -35,24 +35,17 @@
                                                    ng-click="params.channel='ALIPAY';loadTradeLogs()">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=='AlipayAps'}"
-                                                   ng-click="params.channel='AlipayAps';loadTradeLogs(1)">Alipay+</a>|
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='BESTPAY'}"
-                                                   ng-click="params.channel='BESTPAY';loadTradeLogs()">BestPay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='jd'}"
-                                                   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=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';loadTradeLogs(1)">Alipay+</a>|
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';loadTradeLogs(1)">Alipay+(Online)</a>|
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                                                   ng-click="params.channel='YEEPAY';loadTradeLogs(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LAKALAPAY'}"
-                                                   ng-click="params.channel='LAKALAPAY';doAnalysis(1)">LakalaPay</a> |
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';doAnalysis(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';doAnalysis(1)">Card Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
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 595f5e863..38923d027 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
@@ -144,24 +144,19 @@
                             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=='ALIPAYAPS'}"
-                            ng-click="params.channel='ALIPAYAPS';loadTradeLogs(1)">Alipay+</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'}"
-                            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> |
+                        <a role="button" ng-class="{'bg-primary':params.channel=='APSINSTORE'}"
+                            ng-click="params.channel='APSINSTORE';loadTradeLogs(1)">Alipay+</a> |
+                        <a role="button" ng-class="{'bg-primary':params.channel=='APSCASHIER'}"
+                            ng-click="params.channel='APSCASHIER';loadTradeLogs(1)">Alipay+(Online)</a> |
+
+
                         <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                             ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> |
-                        <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                            ng-click="params.channel='YEEPAY';loadTradeLogs(1)">Yeepay</a> |
-                        <a role="button" ng-class="{'bg-primary':params.channel=='LAKALAPAY'}"
-                            ng-click="params.channel='LAKALAPAY';loadTradeLogs(1)">LakalaPay</a> |
+
+
                         <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                            ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card Payment</a> |
-                        <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                            ng-click="params.channel='RPAYPMT_DD';loadTradeLogs(1)">Direct Debit</a>
+                            ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card Payment</a>
+
                     </p>
                 </div>
             </div>
@@ -377,7 +372,7 @@
                             <img src="/static/images/alipay_sign.png" uib-tooltip="AlipayOnline"
                                 ng-if="trade.channel=='AlipayOnline'" />
                             <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
-                                ng-if="trade.channel=='AlipayAps'" />
+                                ng-if="trade.channel=='ApsInStore'||trade.channel=='ApsCashier'" />
                             <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_sign.png" uib-tooltip="RPay+"
diff --git a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
index 5a81ecd53..30caf94e7 100644
--- a/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
+++ b/src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
@@ -242,7 +242,7 @@
 
                             <div class="flex-between">
                                 <div class="flex-align-center">
-                                    <img src="/static/images/alipay_online.png" style="width: 16px;height: 16px;"
+                                    <img src="/static/images/alipay_aps_big.svg" style="width: 20px;height: 20px;"
                                          uib-tooltip="AlipayPlus" />
                                     <h5 style="margin-left: 5px;">
                                         Alipay+(Retail) : <span ng-bind="partnerInfo.client_moniker"></span>
@@ -281,7 +281,7 @@
 
                             <div class="flex-between">
                                 <div class="flex-align-center">
-                                    <img src="/static/images/alipay_online.png" style="width: 16px;height: 16px;"
+                                    <img src="/static/images/alipay_aps_big.svg" style="width: 20px;height: 20px;"
                                          uib-tooltip="AlipayPlus" />
                                     <h5 style="margin-left: 5px;">
                                         Alipay+(Online) : <span ng-bind="partnerInfo.client_moniker"></span>
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 0da8bfeeb..81daa870e 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -155,8 +155,12 @@
                                                    ng-click="params.channel='ALIPAYONLINE';loadTradeLogs(1)">AlipayOnline</a>
                                                 |
                                                 <a role="button"
-                                                   ng-class="{'bg-primary':params.channel=='ALIPAYAPS'}"
-                                                   ng-click="params.channel='ALIPAYAPS';loadTradeLogs(1)">Alipay+</a>
+                                                   ng-class="{'bg-primary':params.channel=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';loadTradeLogs(1)">Alipay+</a>
+                                                |
+                                                <a role="button"
+                                                   ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';loadTradeLogs(1)">Alipay+(Online)</a>
                                                 |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> |
@@ -541,7 +545,7 @@
                                     <img src="/static/images/direct_debit_sign.png"
                                          uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
                                     <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
-                                         ng-if="trade.channel=='AlipayAps'" />
+                                         ng-if="trade.channel=='ApsInStore'||trade.channel=='ApsCashier'" />
                                     {{trade.order_id2}}<span
                                         ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i
                                         class="fa fa-question-circle-o" uib-tooltip-html="trade.htmlTooltip"></i></span>
diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
index 447927324..dadf1d892 100644
--- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
@@ -156,15 +156,18 @@
                                                    ng-click="params.channel='ALIPAYONLINE';loadTradeLogs(1)">AlipayOnline</a>
                                                 |
                                                 <a role="button"
-                                                   ng-class="{'bg-primary':params.channel=='ALIPAYAPS'}"
-                                                   ng-click="params.channel='ALIPAYAPS';loadTradeLogs(1)">Alipay+</a>
+                                                   ng-class="{'bg-primary':params.channel=='ApsInStore'}"
+                                                   ng-click="params.channel='ApsInStore';loadTradeLogs(1)">Alipay+</a>
+                                                |
+                                                <a role="button"
+                                                   ng-class="{'bg-primary':params.channel=='ApsCashier'}"
+                                                   ng-click="params.channel='ApsCashier';loadTradeLogs(1)">Alipay+(Online)</a>
                                                 |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay +</a> |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';loadTradeLogs(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
@@ -375,7 +378,7 @@
                                     <img src="/static/images/direct_debit_sign.png"
                                          uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
                                     <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
-                                         ng-if="trade.channel=='AlipayAps'" />
+                                         ng-if="trade.channel=='ApsInStore'||trade.channel=='ApsCashier'" />
                                     {{trade.order_id}}
                                 </td>
                                 <td>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
index 8973ecf50..76510a722 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
@@ -135,24 +135,17 @@
                                                    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=='ALIPAYAPS'}"
-                                                   ng-click="params.channel='ALIPAYAPS';loadTradeLogs(1)">Alipay+</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'}"
-                                                   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=='APSINSTORE'}"
+                                                   ng-click="params.channel='APSINSTORE';loadTradeLogs(1)">Alipay+</a> |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='APSCASHIER'}"
+                                                   ng-click="params.channel='APSCASHIER';loadTradeLogs(1)">Alipay+(Online)</a> |
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                    ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                                                   ng-click="params.channel='YEEPAY';loadTradeLogs(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LAKALAPAY'}"
-                                                   ng-click="params.channel='LAKALAPAY';loadTradeLogs(1)">LakalaPay</a> |
+
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
-                                                   ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                   ng-click="params.channel='RPAYPMT_DD';loadTradeLogs(1)">Direct Debit</a>
+                                                   ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
@@ -350,7 +343,7 @@
                                      <img src="/static/images/card_payment_sign.png" uib-tooltip="Card Payment" ng-if="trade.channel=='rpaypmt_card'"/>
                                      <img src="/static/images/direct_debit_sign.png" uib-tooltip="Direct Debit" ng-if="trade.channel=='rpaypmt_dd'"/>
                                      <img src="/static/images/alipay_aps.jpg"  style="height: 25px" uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
-                                          ng-if="trade.channel=='AlipayAps'" />
+                                          ng-if="trade.channel=='ApsInStore'||trade.channel=='ApsCashier'" />
                                      {{trade.order_id}}
                                  </td>
                                  <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 592c7b716..8319319ee 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
@@ -214,8 +214,11 @@
                                                     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=='ALIPAYPAPS'}"
-                                                    ng-click="params.channel='ALIPAYPAPS';loadTradeLogs(1)">Alipay+</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='APSINSTORE'}"
+                                                    ng-click="params.channel='APSINSTORE';loadTradeLogs(1)">Alipay+</a>
+                                                |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='APSCASHIER'}"
+                                                    ng-click="params.channel='APSCASHIER';loadTradeLogs(1)">Alipay+(Online)</a>
                                                 |
                                                 <a role="button" ng-class="{'bg-primary':params.channel=='RPAY'}"
                                                     ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+</a> |
@@ -733,7 +736,7 @@
                                             ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='lazada_wallet_my'" />
                                         <img src="/static/images/alipay_aps.jpg" style="height: 25px"
                                              uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
-                                             ng-if="trade.channel=='AlipayAps'" />
+                                             ng-if="trade.channel=='ApsInStore'||trade.channel=='ApsCashier'" />
                                         {{trade.order_id}}<span
                                             ng-if="trade.source!='system' && trade.source!=null && trade.incremental_surcharge != null"><i
                                                 class="fa fa-question-circle-o"
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 63e4cc7b7..aa8eac824 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -191,29 +191,19 @@
                                                     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=='ALIPAYAPS'}"
-                                                    ng-click="params.channel='ALIPAYAPS';loadTradeLogs(1)">Alipay+</a>
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='APSINSTORE'}"
+                                                    ng-click="params.channel='APSINSTORE';loadTradeLogs(1)">Alipay+</a>
+                                                |
+                                                <a role="button" ng-class="{'bg-primary':params.channel=='APSCASHIER'}"
+                                                    ng-click="params.channel='APSCASHIER';loadTradeLogs(1)">Alipay+(Online)</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'}"
-                                                    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> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='YEEPAY'}"
-                                                    ng-click="params.channel='YEEPAY';loadTradeLogs(1)">Yeepay</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='LAKALAPAY'}"
-                                                    ng-click="params.channel='LAKALAPAY';loadTradeLogs(1)">LakalaPay</a>
-                                                |
                                                 <a role="button"
                                                     ng-class="{'bg-primary':params.channel=='RPAYPMT_CARD'}"
                                                     ng-click="params.channel='RPAYPMT_CARD';loadTradeLogs(1)">Card
-                                                    Payment</a> |
-                                                <a role="button" ng-class="{'bg-primary':params.channel=='RPAYPMT_DD'}"
-                                                    ng-click="params.channel='RPAYPMT_DD';loadTradeLogs(1)">Direct
-                                                    Debit</a>
+                                                    Payment</a>
+
                                             </p>
                                         </div>
                                     </div>
@@ -504,7 +494,7 @@
                                             ng-if="trade.channel=='rpaypmt_dd'" />
                                         <img src="/static/images/alipay_aps.jpg" style="height: 25px"
                                             uib-tooltip="{{trade.pay_type}}(Alipay+™ Partner)"
-                                            ng-if="trade.channel=='AlipayAps'" />
+                                            ng-if="trade.channel=='ApsCashier'||trade.channel=='ApsInStore'" />
                                         <img src="/static/images/alipay_sign.png" style="height: 20px"
                                             uib-tooltip="Alipay CN"
                                             ng-if="trade.channel=='AlipayPlus' && trade.pay_type=='alipay_cn'" />