From 12640d5d676492090d67a520ce19ca914e83cd87 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 18 Jan 2018 19:04:52 +0800
Subject: [PATCH] update

---
 .../citypartner/core/impls/CityPartnerPrizeServiceImpl.java   | 2 +-
 .../config/orgcommission/templates/org_commission_root.html   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
index 6a67c86f1..f1947df3b 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/core/impls/CityPartnerPrizeServiceImpl.java
@@ -72,11 +72,11 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             item.put("month", mon);
             item.put("monthstr", year + "-" + StringUtils.substring("00" + mon, -2));
             JSONObject chargeInfo = getCityPartnerPrizeInfo(item.getString("monthstr"));
-            item.put("total_charge", chargeInfo.getString("total_charge"));
             item.put("royalpay_charge", chargeInfo.getString("royalpay_charge"));
             item.put("org_charge", chargeInfo.getString("org_charge"));
             JSONObject referrerChargeInfo = getReferrerPrizeInfo(item.getString("monthstr"));
             item.put("referrer_charge",referrerChargeInfo.getString("org_charge"));
+            item.put("total_charge", chargeInfo.getBigDecimal("org_charge").add(referrerChargeInfo.getBigDecimal("org_charge")));
             monthObjs.add(item);
         }
         return monthObjs;
diff --git a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
index 459a6d1f1..3161bffad 100644
--- a/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
+++ b/src/main/ui/static/config/orgcommission/templates/org_commission_root.html
@@ -29,10 +29,10 @@
                     <div class="info-box-content">
                         <!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>-->
                         <div>
-                           <!-- <div class="info-box-number-right">
+                            <div class="info-box-number-right">
                                 <span class="text-bold">Total Charge:</span>
                                 <span class="text-green" ng-bind="mon.total_charge|currency:'AUD'"></span>
-                            </div>-->
+                            </div>
                             <div class="info-box-number-right">
                                 <span class="text-bold">City Partner Charge:</span>
                                 <span class="text-green" ng-bind="mon.org_charge|currency:'AUD'"></span>