diff --git a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml index 013fb8311..faf20b1d1 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml +++ b/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 @@ and o.gateway=11 + + and o.gateway=12 + + + and o.gateway=13 + and l.org_id=#{org_id} and l.org_id in #{org_id} @@ -595,6 +609,12 @@ and o.gateway=11 + + and o.gateway=12 + + + and o.gateway=13 + and ptran.org_id=#{org_id} and ptran.org_id in #{org_id} 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 027f4ac1b..d4d2c9011 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 @@ -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, diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index fb359860b..39837c2f2 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/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' } } }); diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index f0850e4e8..b7cf22c8a 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/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 '原生二维码' } } }); 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 351050ba1..9f8c729f7 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 @@ -60,7 +60,9 @@ Share Code | MiniProgram + ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram | + Native QR Code

@@ -155,6 +157,7 @@ + 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 44741988a..7bd8e5ea3 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 @@ -122,7 +122,9 @@ Share Code | MiniProgram + ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram | + Native QR Code

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 a73711411..28bee0ccd 100644 --- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html @@ -160,7 +160,9 @@ Share Code | MiniProgram + ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram | + Native QR Code

Client Order ID Order ID Amount