msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable-beforeaps' into stable-beforeaps

Browse Source
master
Yixian 3 years ago
parent f3b48c75ef 3e691e214f
commit 61e879985a
16 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File

6
src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DashboardServiceImpl.java
Unescape View File

@ -240,7 +240,7 @@ public class DashboardServiceImpl implements DashboardService, DashboardAnalysis
@Override
public List<JSONObject> 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<JSONObject> analysis = new ArrayList<>();
params.put("trade_type", "Online API");
List<JSONObject> onlineApi_ordedrs = transactionAnalysisMapper.getOrdersByGateway(params);
@ -268,10 +268,10 @@ public class DashboardServiceImpl implements DashboardService, DashboardAnalysis
if (!retailInStore_orders.isEmpty()) {
analysis.add(retailInStore);
}
params.put("trade_type", "WeChat HTML5");
params.put("trade_type", "In-APP H5");
List<JSONObject> 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;

10
src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml
Unescape View File

@ -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
@ -488,7 +488,7 @@
WHEN 3
THEN 'Online API'
WHEN 4
THEN 'WeChat HTML5'
THEN 'In-APP H5'
WHEN 5
THEN 'Retail API'
WHEN 6
@ -557,7 +557,7 @@
<if test="trade_type=='Online API'">
and o.gateway=3
</if>
<if test="trade_type=='WeChat HTML5'">
<if test="trade_type=='In-APP H5'">
and o.gateway=4
</if>
<if test="trade_type=='Retail API'">
@ -627,7 +627,7 @@
<!--<if test="trade_type=='Online API'">-->
<!--and o.gateway=3-->
<!--</if>-->
<!--<if test="trade_type=='WeChat HTML5'">-->
<!--<if test="trade_type=='In-APP H5'">-->
<!--and o.gateway=4-->
<!--</if>-->
<!--<if test="trade_type=='Retail API'">-->
@ -659,7 +659,7 @@
<if test="trade_type=='Online API'">
and po.gateway=3
</if>
<if test="trade_type=='WeChat HTML5'">
<if test="trade_type=='In-APP H5'">
and po.gateway=4
</if>
<if test="trade_type=='Mobile H5'">

2
src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml
Unescape View File

@ -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

4
src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml
Unescape View File

@ -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

2
src/main/ui/static/analysis/channels_analysis.js
Unescape View File

@ -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
}
},

2
src/main/ui/static/analysis/org-tranaction-analysis.js
Unescape View File

@ -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
}
},

2
src/main/ui/static/analysis/partners-analysis.js
Unescape View File

@ -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
}
},

2
src/main/ui/static/analysis/transaction/analysis-transaction.js
Unescape View File

@ -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
}
},

2
src/main/ui/static/boot/indexMainApp.js
Unescape View File

@ -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':

2
src/main/ui/static/boot/managerMainApp.js
Unescape View File

@ -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':

2
src/main/ui/static/boot/managerMainAppv2.js
Unescape View File

@ -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':

2
src/main/ui/static/dashboard/dashboard.js
Unescape View File

@ -608,7 +608,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
}
},

6
src/main/ui/static/dashboard/partner-dashboard.js
Unescape View File

@ -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
},

2
src/main/ui/static/payment/partner/templates/partner_pay_logs.html
Unescape View File

@ -92,7 +92,7 @@
<a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
ng-click="params.gateway=[3];loadTradeLogs(1)">Online API</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
ng-click="params.gateway=[4];loadTradeLogs(1)">In-APP H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"

2
src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
Unescape View File

@ -245,7 +245,7 @@
<a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
ng-click="params.gateway=[3];loadTradeLogs(1)">Online API</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
ng-click="params.gateway=[4];loadTradeLogs(1)">In-APP H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"

2
src/main/ui/static/payment/tradelog/templates/trade_logs.html
Unescape View File

@ -235,7 +235,7 @@
<a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
ng-click="params.gateway=[3];loadTradeLogs(1)">Online API</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
ng-click="params.gateway=[4];loadTradeLogs(1)">In-APP H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"

Write Preview
Loading…
Cancel
Save