eason.qian 7 years ago
parent e6e4ced9a0
commit ece7015c13

@ -309,6 +309,7 @@ public class RetailAppServiceImp implements RetailAppService {
params.put("client_id", client_id); params.put("client_id", client_id);
PageList<JSONObject> logs = clearingDetailMapper.listClientSettlementLog(params, PageList<JSONObject> logs = clearingDetailMapper.listClientSettlementLog(params,
new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("report_date.desc"))); new PageBounds(appQueryBean.getPage(), appQueryBean.getLimit(), Order.formString("report_date.desc")));
logs.forEach(log -> log.put("total_charge",log.getBigDecimal("total_charge").add(log.getBigDecimal("tax_amount"))));
return PageListUtils.buildPageListResult(logs); return PageListUtils.buildPageListResult(logs);
} }
@ -329,6 +330,7 @@ public class RetailAppServiceImp implements RetailAppService {
List<JSONObject> channels = clearingDetailAnalysisMapper.listReportChannels(String.valueOf(clearing_detail_id)); List<JSONObject> channels = clearingDetailAnalysisMapper.listReportChannels(String.valueOf(clearing_detail_id));
JSONObject channelsObj = new JSONObject(); JSONObject channelsObj = new JSONObject();
for (JSONObject channel : channels) { for (JSONObject channel : channels) {
channel.put("total_charge",channel.getBigDecimal("total_charge").add(channel.getBigDecimal("tax_amount")));
channelsObj.put(channel.getString("channel"), channel); channelsObj.put(channel.getString("channel"), channel);
} }
List<JSONObject> credit = new ArrayList<>(); List<JSONObject> credit = new ArrayList<>();

Loading…
Cancel
Save