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