master
wangning 7 years ago
parent 2eea4ed50c
commit 9f8157372f

@ -528,6 +528,7 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
JSONObject chargeInfo = getAgentPrizeInfo(item.getString("monthstr")); JSONObject chargeInfo = getAgentPrizeInfo(item.getString("monthstr"));
item.put("org_charge", chargeInfo.getString("org_charge")); item.put("org_charge", chargeInfo.getString("org_charge"));
item.put("gross_amount", chargeInfo.getString("gross_amount")); item.put("gross_amount", chargeInfo.getString("gross_amount"));
item.put("total_charge", chargeInfo.getString("total_charge"));
monthObjs.add(item); monthObjs.add(item);
} }
return monthObjs; return monthObjs;
@ -543,10 +544,12 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
JSONObject sum = new JSONObject(); JSONObject sum = new JSONObject();
sum.put("gross_amount", 0); sum.put("gross_amount", 0);
sum.put("org_charge", 0); sum.put("org_charge", 0);
sum.put("total_charge",0);
List<JSONObject> referrerPrizes = financialAgentCommissionMapper.list(year, month); List<JSONObject> referrerPrizes = financialAgentCommissionMapper.list(year, month);
for (JSONObject prize : referrerPrizes) { for (JSONObject prize : referrerPrizes) {
plusKey(sum, prize, "gross_amount"); plusKey(sum, prize, "gross_amount");
plusKey(sum, prize, "org_charge"); plusKey(sum, prize, "org_charge");
plusKey(sum, prize, "total_charge");
prize.put("monthstr", monthStr); prize.put("monthstr", monthStr);
} }
sum.put("referrer", referrerPrizes); sum.put("referrer", referrerPrizes);

@ -9,6 +9,9 @@
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
Total Charge:<span ng-bind="monthData.agent_total_charge|currency:'AUD'"></span> Total Charge:<span ng-bind="monthData.agent_total_charge|currency:'AUD'"></span>
</div> </div>
<div class="col-xs-6 col-sm-3">
Gross Amount:<span ng-bind="monthData.gross_amount|currency:'AUD'"></span>
</div>
<div class="col-xs-6 col-sm-3"> <div class="col-xs-6 col-sm-3">
RoyalPay Charge:<span ng-bind="monthData.royalpay_charge|currency:'AUD'"></span> RoyalPay Charge:<span ng-bind="monthData.royalpay_charge|currency:'AUD'"></span>
</div> </div>

@ -39,7 +39,7 @@
<div> <div>
<div class="info-box-number-right"> <div class="info-box-number-right">
<span class="text-bold">Total Charge:</span> <span class="text-bold">Total Charge:</span>
<span class="text-green" ng-bind="mon.gross_amount|currency:'AUD'"></span> <span class="text-green" ng-bind="mon.total_charge|currency:'AUD'"></span>
</div> </div>
<div class="info-box-number-right"> <div class="info-box-number-right">
<span class="text-bold">Org Charge:</span> <span class="text-bold">Org Charge:</span>

Loading…
Cancel
Save