master
wangning 7 years ago
parent 7e050369ee
commit b153a3add8

@ -75,6 +75,8 @@ public class CityPartnerPrizeServiceImpl implements CityPartnerPrizeService {
item.put("total_charge", chargeInfo.getString("total_charge")); item.put("total_charge", chargeInfo.getString("total_charge"));
item.put("royalpay_charge", chargeInfo.getString("royalpay_charge")); item.put("royalpay_charge", chargeInfo.getString("royalpay_charge"));
item.put("org_charge", chargeInfo.getString("org_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); monthObjs.add(item);
} }
return monthObjs; return monthObjs;

@ -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.citypartner.core.CityPartnerPrizeService;
import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; 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 au.com.royalpay.payment.tools.permission.enums.ManagerRole;
import com.alibaba.fastjson.JSONObject; 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.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

@ -29,18 +29,18 @@
<div class="info-box-content"> <div class="info-box-content">
<!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>--> <!--<div class="info-box-text text-bold text-red" ng-bind="r.charge_date"></div>-->
<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.total_charge|currency:'AUD'"></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">RoyalPay Charge:</span>
<span class="text-green" ng-bind="mon.royalpay_charge|currency:'AUD'"></span>
</div>
<div class="info-box-number-right"> <div class="info-box-number-right">
<span class="text-bold">City Partner Charge:</span> <span class="text-bold">City Partner Charge:</span>
<span class="text-green" ng-bind="mon.org_charge|currency:'AUD'"></span> <span class="text-green" ng-bind="mon.org_charge|currency:'AUD'"></span>
</div> </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> </div>
</div> </div>

Loading…
Cancel
Save