master
wangning 7 years ago
parent adac252b26
commit 12640d5d67

@ -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;

@ -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>

Loading…
Cancel
Save