Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml

@@ -196,6 +196,10 @@
                 THEN 'APP'
             WHEN 11
                 THEN 'Share Code'
+            WHEN 12
+                THEN 'MICROAPP'
+            WHEN 13
+                THEN 'Native QR Code'
             END AS                            gateway_label,
             ifnull(sum(if(l.transaction_type='Credit',l.clearing_amount,0)), 0) aud_fee
         FROM pmt_transactions l
@@ -455,6 +459,10 @@
                 THEN 'APP'
             WHEN 11
                 THEN 'Share Code'
+            WHEN 12
+                THEN 'MICROAPP'
+            WHEN 13
+                THEN 'Native QR Code'
             END AS                                 gateway_label,
             ifnull(COUNT(DISTINCT l.client_id), 0) partner_count
         FROM pmt_transactions l
@@ -512,6 +520,12 @@
         <if test="trade_type=='Share Code'">
             and o.gateway=11
         </if>
+        <if test="trade_type=='MICROAPP'">
+            and o.gateway=12
+        </if>
+        <if test="trade_type=='Native QR Code'">
+            and o.gateway=13
+        </if>
         <if test="org_id!=null and org_ids==null">and l.org_id=#{org_id}</if>
         <if test="org_ids!=null">and l.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>
@@ -595,6 +609,12 @@
         <if test="trade_type=='Share Code'">
             and o.gateway=11
         </if>
+        <if test="trade_type=='MICROAPP'">
+            and o.gateway=12
+        </if>
+        <if test="trade_type=='Native QR Code'">
+            and o.gateway=13
+        </if>
         <if test="org_id!=null and org_ids==null">and ptran.org_id=#{org_id}</if>
         <if test="org_ids!=null">and ptran.org_id in
             <foreach collection="org_ids" item="org_id" open="(" close=")" separator=",">#{org_id}</foreach></if>

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml

@@ -87,6 +87,8 @@
                 THEN 'APP'
             WHEN 12
                 THEN 'MICROAPP'
+            WHEN 13
+                THEN 'Native QR Code'
             END AS                                     gateway,
             p.client_moniker                           partner_code,
             p.short_name                               partner_name,

src/main/ui/static/boot/indexMainApp.js

@@ -542,7 +542,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '11':
                     return 'Share Code';
                 case '12':
-                    return 'MICROAPP'
+                    return 'MICROAPP';
+                case '13':
+                    return 'Native QR Code'
             }
         }
     });

src/main/ui/static/boot/managerMainApp.js

@@ -327,7 +327,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '11':
                     return '账单码';
                 case '12':
-                    return '小程序'
+                    return '小程序';
+                case '13':
+                    return '原生二维码'
             }
         }
     });

src/main/ui/static/payment/partner/templates/partner_pay_logs.html

@@ -60,7 +60,9 @@
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
                            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)">MiniProgram</a>
+                           ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
+                        <a role="button" ng-class="{'bg-primary':gatewaySelected([13])}"
+                           ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code</a>
                     </p>
                 </div>
             </div>
@@ -155,6 +157,7 @@
             <table class="table table-bordered table-hover table-striped">
                 <thead>
                 <tr>
+
                     <th>Client Order ID</th>
                     <th>Order ID</th>
                     <th>Amount</th>

src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html

@@ -122,7 +122,9 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
                                                    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)">MiniProgram</a>
+                                                   ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
+                                                <a role="button" ng-class="{'bg-primary':gatewaySelected([13])}"
+                                                   ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code</a>
                                             </p>
                                         </div>
                                     </div>

src/main/ui/static/payment/tradelog/templates/trade_logs.html

@@ -160,7 +160,9 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
                                                    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)">MiniProgram</a>
+                                                   ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
+                                                <a role="button" ng-class="{'bg-primary':gatewaySelected([13])}"
+                                                   ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code</a>
                                             </p>
                                         </div>
                                     </div>