From 1d83d816f67b53141193912bc8f5fb449287c49a Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Mon, 15 Nov 2021 16:06:50 +0800 Subject: [PATCH] =?UTF-8?q?Wechat=20HTML5=20=E6=94=B9=E4=B8=BAIn-APP=20H5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/core/impls/DashboardServiceImpl.java | 6 +++--- .../analysis/mappers/TransactionAnalysisMapper.xml | 10 +++++----- .../payment/manage/mappers/payment/OrderMapper.xml | 2 +- .../manage/mappers/payment/TransactionMapper.xml | 4 ++-- src/main/ui/static/analysis/channels_analysis.js | 2 +- src/main/ui/static/analysis/org-tranaction-analysis.js | 2 +- src/main/ui/static/analysis/partners-analysis.js | 2 +- .../analysis/transaction/analysis-transaction.js | 2 +- src/main/ui/static/boot/indexMainApp.js | 2 +- src/main/ui/static/boot/managerMainApp.js | 2 +- src/main/ui/static/boot/managerMainAppv2.js | 2 +- src/main/ui/static/dashboard/dashboard.js | 2 +- src/main/ui/static/dashboard/partner-dashboard.js | 6 +++--- .../payment/partner/templates/partner_pay_logs.html | 2 +- .../payment/tradelog/templates/partner_trade_logs.html | 2 +- .../static/payment/tradelog/templates/trade_logs.html | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java index 0ef0aa84b..840c5f913 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java @@ -241,7 +241,7 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT @Override public List getTradeAnalysisInTime(JSONObject params) { - //"Online API", "QR Code", "Retail API", "Retail In-Store", "WeChat HTML5" + //"Online API", "QR Code", "Retail API", "Retail In-Store", "In-APP H5" List analysis = new ArrayList<>(); params.put("trade_type", "Online API"); List onlineApi_ordedrs = transactionAnalysisMapper.getOrdersByGateway(params); @@ -269,10 +269,10 @@ public class DashboardServiceImpl implements DashboardService,DashboardAnalysisT if (!retailInStore_orders.isEmpty()) { analysis.add(retailInStore); } - params.put("trade_type", "WeChat HTML5"); + params.put("trade_type", "In-APP H5"); List wechatHtml5_orders = transactionAnalysisMapper.getOrdersByGateway(params); JSONObject wechatHtml5 = new JSONObject(); - wechatHtml5.put("name", "WeChat HTML5"); + wechatHtml5.put("name", "In-APP H5"); wechatHtml5.put("data", wechatHtml5_orders); analysis.add(wechatHtml5); return analysis; 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 afd6e95a0..f6a5c851b 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 @@ -245,7 +245,7 @@ WHEN 3 THEN 'Online API' WHEN 4 - THEN 'WeChat HTML5' + THEN 'In-APP H5' WHEN 5 THEN 'Retail API' WHEN 6 @@ -519,7 +519,7 @@ WHEN 3 THEN 'Online API' WHEN 4 - THEN 'WeChat HTML5' + THEN 'In-APP H5' WHEN 5 THEN 'Retail API' WHEN 6 @@ -588,7 +588,7 @@ and o.gateway=3 - + and o.gateway=4 @@ -658,7 +658,7 @@ - + @@ -690,7 +690,7 @@ and po.gateway=3 - + and po.gateway=4 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 e0f911fc8..2dc02ae76 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 @@ -78,7 +78,7 @@ WHEN 3 THEN 'Online API' WHEN 4 - THEN 'WeChat HTML5' + THEN 'In-APP H5' WHEN 5 THEN 'Retail API' WHEN 6 diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index 5d679c115..a3ad97ee1 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -48,7 +48,7 @@ WHEN 3 THEN 'Online API' WHEN 4 - THEN 'WeChat HTML5' + THEN 'In-APP H5' WHEN 5 THEN 'Retail API' WHEN 6 @@ -202,7 +202,7 @@ WHEN 3 THEN 'Online API' WHEN 4 - THEN 'WeChat HTML5' + THEN 'In-APP H5' WHEN 5 THEN 'Retail API' WHEN 6 diff --git a/src/main/ui/static/analysis/channels_analysis.js b/src/main/ui/static/analysis/channels_analysis.js index 3a14cdab3..a3b922519 100644 --- a/src/main/ui/static/analysis/channels_analysis.js +++ b/src/main/ui/static/analysis/channels_analysis.js @@ -139,7 +139,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', ' orient: 'vertical', y: '450px', left: 'right', - //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "WeChat HTML5"] + //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "In-APP H5"] data: legend } }, diff --git a/src/main/ui/static/analysis/org-tranaction-analysis.js b/src/main/ui/static/analysis/org-tranaction-analysis.js index e15d190dd..bbc2641bd 100644 --- a/src/main/ui/static/analysis/org-tranaction-analysis.js +++ b/src/main/ui/static/analysis/org-tranaction-analysis.js @@ -122,7 +122,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./org/analysis-o orient: 'vertical', y: '450px', left: 'right', - //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "WeChat HTML5"] + //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "In-APP H5"] data: legend } }, diff --git a/src/main/ui/static/analysis/partners-analysis.js b/src/main/ui/static/analysis/partners-analysis.js index 32a1fdadd..103632702 100644 --- a/src/main/ui/static/analysis/partners-analysis.js +++ b/src/main/ui/static/analysis/partners-analysis.js @@ -255,7 +255,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an orient: 'vertical', y: '450px', left: 'right', - //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "WeChat HTML5"] + //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "In-APP H5"] data: legend } }, diff --git a/src/main/ui/static/analysis/transaction/analysis-transaction.js b/src/main/ui/static/analysis/transaction/analysis-transaction.js index c813a898d..90c1d74ac 100644 --- a/src/main/ui/static/analysis/transaction/analysis-transaction.js +++ b/src/main/ui/static/analysis/transaction/analysis-transaction.js @@ -310,7 +310,7 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','echarts'], funct orient: 'vertical', y: '450px', left: 'right', - //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "WeChat HTML5"] + //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "In-APP H5"] data: legend } }, diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js index 0b2d2c982..122700531 100644 --- a/src/main/ui/static/boot/indexMainApp.js +++ b/src/main/ui/static/boot/indexMainApp.js @@ -564,7 +564,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '3': return 'Online API'; case '4': - return 'WeChat HTML5'; + return 'In-APP H5'; case '5': return 'Retail API'; case '6': diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index 6d7bb0f81..6b540588d 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -447,7 +447,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '3': return '线上网关'; case '4': - return 'WeChat HTML5'; + return 'In-APP H5'; case '5': return '线下网关(C端付款码)'; case '6': diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js index 6aab58f0c..7a2e4bf60 100644 --- a/src/main/ui/static/boot/managerMainAppv2.js +++ b/src/main/ui/static/boot/managerMainAppv2.js @@ -468,7 +468,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case '3': return '线上网关'; case '4': - return 'WeChat HTML5'; + return 'In-APP H5'; case '5': return '线下网关(C端付款码)'; case '6': diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js index 5eb574c10..abc579918 100644 --- a/src/main/ui/static/dashboard/dashboard.js +++ b/src/main/ui/static/dashboard/dashboard.js @@ -610,7 +610,7 @@ define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], functio orient: 'vertical', y: '450px', left: 'right', - //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "WeChat HTML5"] + //data: ["Online API", "QR Code", "Retail API", "Retail In-Store", "In-APP H5"] data: legend } }, diff --git a/src/main/ui/static/dashboard/partner-dashboard.js b/src/main/ui/static/dashboard/partner-dashboard.js index e415d096f..2ae8b98dc 100644 --- a/src/main/ui/static/dashboard/partner-dashboard.js +++ b/src/main/ui/static/dashboard/partner-dashboard.js @@ -175,7 +175,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct legend: { data: ['Total Amount', 'Total Count', 'Retail In-Store Amount', 'Retail In-Store Count', 'Retail API Amount', 'Retail API Count', 'QR Code Amount', 'QR Code Count', - 'Online API Amount', 'Online API Count', 'WeChat HTML5 Amount', 'WeChat HTML5 Count'], + 'Online API Amount', 'Online API Count', 'In-APP H5 Amount', 'In-APP H5 Count'], bottom: 0, height: '15%', width: '80%', @@ -295,7 +295,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct }, { basic: { - name: 'WeChat HTML5 Amount', + name: 'In-APP H5 Amount', type: 'line', symbol: 'triangle', areaStyle: {normal: {}}, @@ -305,7 +305,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct }, { basic: { - name: 'WeChat HTML5 Count', + name: 'In-APP H5 Count', type: 'line', yAxisIndex: 1 }, 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 8928a2b20..1ae92bef0 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 @@ -92,7 +92,7 @@ Online API | WeChat HTML5 | + ng-click="params.gateway=[4];loadTradeLogs(1)">In-APP H5 | Mobile H5 | Online API | WeChat HTML5 | + ng-click="params.gateway=[4];loadTradeLogs(1)">In-APP H5 | Mobile H5 | Online API | WeChat HTML5 | + ng-click="params.gateway=[4];loadTradeLogs(1)">In-APP H5 | Mobile H5 |