diff --git a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java index 8b27d82bc..3dfcdfb49 100644 --- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java @@ -724,7 +724,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider @Override public JSONObject listClearingTransactions(int client_id, String clearingDetailId, JSONObject partner) { - JSONObject client = clientManager.getClientInfo(client_id); Assert.notNull(client, "Client not exists"); int parent_client_id = client.getIntValue("parent_client_id"); @@ -886,7 +885,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_payment")); row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_refund")); row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("gross_amount")); - row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("total_charge")); + row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getBigDecimal("total_charge").add(clearTransation.getBigDecimal("tax_amount")).toPlainString()); row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(clearTransation.getString("clearing_amount")); wb.write(ous);