|
|
@ -73,6 +73,7 @@ public class CityPartnerPrizeController {
|
|
|
|
BigDecimal netCharge = BigDecimal.ZERO;
|
|
|
|
BigDecimal netCharge = BigDecimal.ZERO;
|
|
|
|
String cityPartnerName = "";
|
|
|
|
String cityPartnerName = "";
|
|
|
|
int org_id = 0;
|
|
|
|
int org_id = 0;
|
|
|
|
|
|
|
|
int type = 1;
|
|
|
|
for (JSONObject jsonObject : entry.getValue()) {
|
|
|
|
for (JSONObject jsonObject : entry.getValue()) {
|
|
|
|
grossAmount = grossAmount.add(jsonObject.getBigDecimal("gross_amount"));
|
|
|
|
grossAmount = grossAmount.add(jsonObject.getBigDecimal("gross_amount"));
|
|
|
|
totalCharge = totalCharge.add(jsonObject.getBigDecimal("total_charge"));
|
|
|
|
totalCharge = totalCharge.add(jsonObject.getBigDecimal("total_charge"));
|
|
|
@ -83,6 +84,7 @@ public class CityPartnerPrizeController {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
org_id = jsonObject.getIntValue("org_id");
|
|
|
|
org_id = jsonObject.getIntValue("org_id");
|
|
|
|
cityPartnerName = jsonObject.getString("name");
|
|
|
|
cityPartnerName = jsonObject.getString("name");
|
|
|
|
|
|
|
|
type = jsonObject.getIntValue("commission_type");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sumResult.put("gross_amount", grossAmount);
|
|
|
|
sumResult.put("gross_amount", grossAmount);
|
|
|
|
sumResult.put("total_charge", totalCharge);
|
|
|
|
sumResult.put("total_charge", totalCharge);
|
|
|
@ -91,6 +93,7 @@ public class CityPartnerPrizeController {
|
|
|
|
sumResult.put("org_name", cityPartnerName);
|
|
|
|
sumResult.put("org_name", cityPartnerName);
|
|
|
|
sumResult.put("org_id", org_id);
|
|
|
|
sumResult.put("org_id", org_id);
|
|
|
|
sumResult.put("net_charge", netCharge);
|
|
|
|
sumResult.put("net_charge", netCharge);
|
|
|
|
|
|
|
|
sumResult.put("type",type);
|
|
|
|
sumResult.put("channel_detail", entry.getValue());
|
|
|
|
sumResult.put("channel_detail", entry.getValue());
|
|
|
|
resultTotalCharge = resultTotalCharge.add(totalCharge);
|
|
|
|
resultTotalCharge = resultTotalCharge.add(totalCharge);
|
|
|
|
resultRoyalpayCharge = resultRoyalpayCharge.add(royalpayCharge);
|
|
|
|
resultRoyalpayCharge = resultRoyalpayCharge.add(royalpayCharge);
|
|
|
|