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

Merge branch 'develop'

Browse Source
master
yangkai 6 years ago
parent 4868fd3706 173881f899
commit 9b465fe3aa
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
Unescape View File

@ -2,12 +2,12 @@ package au.com.royalpay.payment.manage.dev.web;
import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
import au.com.royalpay.payment.manage.support.wechatclients.RedpackWechatApiImpl;
import au.com.royalpay.payment.tools.CommonConsts;
import au.com.royalpay.payment.tools.connections.mpsupport.beans.WxOauthType;
import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
import au.com.royalpay.payment.tools.permission.wechat.WechatMapping;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.globalfreepay.payment.tools.CommonConsts;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

78
src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
Unescape View File

@ -209,45 +209,45 @@
</div>
</div>
</div>-->
<div class="box box-success">
<div class="box-header">Sydney GM Commission</div>
<div class="box-body">
<div class="row">
<div class="col-xs-6 col-sm-6">
Transaction Amount: <span ng-bind="report.sydneyPrizeLog.total_amount|currency:'AUD '"></span>
</div>
<div class="col-xs-6 col-sm-6">
Total Commission: <span ng-bind="report.sydneyPrizeLog.total_prize|currency:'AUD '"></span>
</div>
</div>
</div>
</div>
<div class="box box-success">
<div class="box-header">NJ Department Commission</div>
<div class="box-body">
<div class="row">
<div class="col-xs-6 col-sm-6">
Transaction Amount: <span ng-bind="report.ngDepartmentPrizeLog.total_amount|currency:'AUD '"></span>
</div>
<div class="col-xs-6 col-sm-6">
Total Commission: <span ng-bind="report.ngDepartmentPrizeLog.total_prize|currency:'AUD '"></span>
</div>
</div>
</div>
</div>
<div class="box box-success">
<div class="box-header">COO Commission</div>
<div class="box-body">
<div class="row">
<div class="col-xs-6 col-sm-6">
Transaction Amount: <span ng-bind="report.directPrizeLogs.total_amount|currency:'AUD '"></span>
</div>
<div class="col-xs-6 col-sm-6">
Total Commission: <span ng-bind="report.directPrizeLogs.total_prize|currency:'AUD '"></span>
</div>
</div>
</div>
</div>
<!--<div class="box box-success">-->
<!--<div class="box-header">Sydney GM Commission</div>-->
<!--<div class="box-body">-->
<!--<div class="row">-->
<!--<div class="col-xs-6 col-sm-6">-->
<!--Transaction Amount: <span ng-bind="report.sydneyPrizeLog.total_amount|currency:'AUD '"></span>-->
<!--</div>-->
<!--<div class="col-xs-6 col-sm-6">-->
<!--Total Commission: <span ng-bind="report.sydneyPrizeLog.total_prize|currency:'AUD '"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="box box-success">-->
<!--<div class="box-header">NJ Department Commission</div>-->
<!--<div class="box-body">-->
<!--<div class="row">-->
<!--<div class="col-xs-6 col-sm-6">-->
<!--Transaction Amount: <span ng-bind="report.ngDepartmentPrizeLog.total_amount|currency:'AUD '"></span>-->
<!--</div>-->
<!--<div class="col-xs-6 col-sm-6">-->
<!--Total Commission: <span ng-bind="report.ngDepartmentPrizeLog.total_prize|currency:'AUD '"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="box box-success">-->
<!--<div class="box-header">COO Commission</div>-->
<!--<div class="box-body">-->
<!--<div class="row">-->
<!--<div class="col-xs-6 col-sm-6">-->
<!--Transaction Amount: <span ng-bind="report.directPrizeLogs.total_amount|currency:'AUD '"></span>-->
<!--</div>-->
<!--<div class="col-xs-6 col-sm-6">-->
<!--Total Commission: <span ng-bind="report.directPrizeLogs.total_prize|currency:'AUD '"></span>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="box-header">Manager Commission</div>-->
<!--<div class="box-body table-responsive">-->
<!--<table class="table table-bordered table-hover table-striped">-->

Write Preview
Loading…
Cancel
Save