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