From 68339f4027a8a1c2bcf9ac1aff135e95570411d1 Mon Sep 17 00:00:00 2001
From: yuan <1551130722@qq.com>
Date: Wed, 16 May 2018 10:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0gateway=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../royalpay/payment/manage/mappers/payment/OrderMapper.xml | 2 ++
 src/main/ui/static/boot/indexMainApp.js                     | 4 +++-
 src/main/ui/static/boot/managerMainApp.js                   | 4 +++-
 .../static/payment/partner/templates/partner_pay_logs.html  | 4 +++-
 .../payment/tradelog/templates/partner_trade_logs.html      | 6 ++++--
 .../ui/static/payment/tradelog/templates/trade_logs.html    | 6 ++++--
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
index d2ffdcf7b..027f4ac1b 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
@@ -85,6 +85,8 @@
                 THEN 'Third Party Gateway'
             WHEN 10
                 THEN 'APP'
+            WHEN 12
+                THEN 'MICROAPP'
             END AS                                     gateway,
             p.client_moniker                           partner_code,
             p.short_name                               partner_name,
diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js
index 7737488a4..fb359860b 100644
--- a/src/main/ui/static/boot/indexMainApp.js
+++ b/src/main/ui/static/boot/indexMainApp.js
@@ -540,7 +540,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '10':
                     return 'APP';
                 case '11':
-                    return 'Share Code'
+                    return 'Share Code';
+                case '12':
+                    return 'MICROAPP'
             }
         }
     });
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js
index 5909fa751..f0850e4e8 100644
--- a/src/main/ui/static/boot/managerMainApp.js
+++ b/src/main/ui/static/boot/managerMainApp.js
@@ -325,7 +325,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '10':
                     return 'APP网关';
                 case '11':
-                    return '账单码'
+                    return '账单码';
+                case '12':
+                    return '小程序'
             }
         }
     });
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 3a8000e4d..2a050bb0d 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
@@ -58,7 +58,9 @@
                         <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])}"
-                           ng-click="params.gateway=[11];loadTradeLogs(1)">Share Code</a>
+                           ng-click="params.gateway=[11];loadTradeLogs(1)">Share Code</a> |
+                        <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
+                           ng-click="params.gateway=[12];loadTradeLogs(1)">MICROAPP</a>
                     </p>
                 </div>
             </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index dfc9bcbb4..ddb9e7da0 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
@@ -118,9 +118,11 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
                                                    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>
+                                                   ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
-                                                   ng-click="params.gateway=[11];loadTradeLogs(1)">Share Code</a>
+                                                   ng-click="params.gateway=[11];loadTradeLogs(1)">Share Code</a>  |
+                                                <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
+                                                   ng-click="params.gateway=[12];loadTradeLogs(1)">MICROAPP</a>
                                             </p>
                                         </div>
                                     </div>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index 36d8b6f17..a265e5f0a 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -156,9 +156,11 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
                                                    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>
+                                                   ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
-                                                   ng-click="params.gateway=[11];loadTradeLogs(1)">Share Code</a>
+                                                   ng-click="params.gateway=[11];loadTradeLogs(1)">Share Code</a> |
+                                                <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
+                                                   ng-click="params.gateway=[12];loadTradeLogs(1)">MICROAPP</a>
                                             </p>
                                         </div>
                                     </div>