From 173881f899977e11ab1d1ae32c8f3cc6dc18e225 Mon Sep 17 00:00:00 2001
From: yangkai <kai.yang@globalfreepay.com>
Date: Wed, 6 Mar 2019 09:44:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=99=A4bd=E3=80=81bd=5Flead?=
 =?UTF-8?q?er=E4=BB=A5=E5=A4=96=E7=9A=84=E6=8F=90=E6=88=90=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/dev/web/TestMerchantPassword.java  |  2 +-
 .../templates/bd_prize_month_report.html      | 78 +++++++++----------
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
index b1ba4cccd..fb635d8e0 100644
--- a/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
+++ b/src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
@@ -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;
diff --git a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
index 1093b05de..201b0734d 100644
--- a/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
+++ b/src/main/ui/static/config/bdprize/templates/bd_prize_month_report.html
@@ -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">-->