From b153a3add8b562947a9003822cbab9f59021f3a2 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Thu, 18 Jan 2018 18:56:23 +0800
Subject: [PATCH] update

---
 .../core/impls/CityPartnerPrizeServiceImpl.java      |  2 ++
 .../citypartner/web/CityPartnerPrizeController.java  |  2 --
 .../orgcommission/templates/org_commission_root.html | 12 ++++++------
 3 files changed, 8 insertions(+), 8 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 71f147ec8..6a67c86f1 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
@@ -75,6 +75,8 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
             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"));
             monthObjs.add(item);
         }
         return monthObjs;
diff --git a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java
index 3e53c6041..95e08aa96 100644
--- a/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/citypartner/web/CityPartnerPrizeController.java
@@ -2,12 +2,10 @@ package au.com.royalpay.payment.manage.citypartner.web;
 
 import au.com.royalpay.payment.manage.citypartner.core.CityPartnerPrizeService;
 import au.com.royalpay.payment.manage.permission.manager.ManagerMapping;
-import au.com.royalpay.payment.tools.CommonConsts;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 
 import com.alibaba.fastjson.JSONObject;
 
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
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 b51901666..459a6d1f1 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,18 +29,18 @@
                     <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 class="info-box-number-right">
-                                <span class="text-bold">RoyalPay Charge:</span>
-                                <span class="text-green" ng-bind="mon.royalpay_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>
                             </div>
+                            <div class="info-box-number-right">
+                                <span class="text-bold">Referrer Charge:</span>
+                                <span class="text-green" ng-bind="mon.referrer_charge|currency:'AUD'"></span>
+                            </div>
                         </div>
                     </div>
                 </div>