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 f99e6716a..d26342ad5 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 @@ -827,7 +827,7 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider int rowNum = 0; Row row = sheet.createRow(rowNum); String[] title = {"order Id", "Client Order Id", "Transaction Time", "Channel", "Gateway", "Exchange Rate", "Transaction Type", "Currency", - "Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No","Incremental Surcharge"}; + "Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No"}; String[] analysis = {"Total Credit", "Total Debit", "Gross Amount", "Total Charge", "Net Amount"}; for (int i = 0; i < title.length; i++) { row.createCell(i, Cell.CELL_TYPE_STRING).setCellValue(title[i]); @@ -870,7 +870,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider if (device != null) clientDevId = device.getString("client_dev_id"); row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(clientDevId); - row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("incremental_surcharge_settle")); } row = sheet.createRow(++rowNum); for (int i = 0; i < analysis.length; i++) { diff --git a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java index f5a1d60c0..d1450e17e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/tradelog/core/impls/TradeLogServiceImpl.java @@ -795,15 +795,16 @@ public class TradeLogServiceImpl implements TradeLogService { row.createCell(10, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_amount")); row.createCell(11, Cell.CELL_TYPE_STRING).setCellValue(data.getString("settle_amount")); row.createCell(12, Cell.CELL_TYPE_STRING).setCellValue(data.getString("total_surcharge")); - row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(data.getString("tax_amount")); - row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_time")); - row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing") ? "-" : data.getBigDecimal("exchange_rate").toString()); - row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type")); - row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status")); - row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway")); - row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail")); - row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id")); - row.createCell(21, Cell.CELL_TYPE_STRING).setCellValue(StringUtils.defaultString(data.getString("incremental_surcharge"),"0.0000")); + row.createCell(13, Cell.CELL_TYPE_STRING).setCellValue(StringUtils.defaultString(data.getString("incremental_surcharge"),"0.0000")); + row.createCell(14, Cell.CELL_TYPE_STRING).setCellValue(data.getString("tax_amount")); + row.createCell(15, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clearing_time")); + row.createCell(16, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type").equals("clearing") ? "-" : data.getBigDecimal("exchange_rate").toString()); + row.createCell(17, Cell.CELL_TYPE_STRING).setCellValue(data.getString("trans_type")); + row.createCell(18, Cell.CELL_TYPE_STRING).setCellValue(data.getString("clear_status")); + row.createCell(19, Cell.CELL_TYPE_STRING).setCellValue(data.getString("gateway")); + row.createCell(20, Cell.CELL_TYPE_STRING).setCellValue(data.getString("order_detail")); + row.createCell(21, Cell.CELL_TYPE_STRING).setCellValue(data.getString("dev_id")); + } @Override @@ -1452,8 +1453,8 @@ public class TradeLogServiceImpl implements TradeLogService { Row row = sheet.createRow(rowNum); String[] title = {"Transaction Time", "Client Order ID", "System Order ID", "Client Moniker", "Short Name", "Order ID", "Channel", "Input Amount", "Transaction Amount", "Transaction Currency", "Clearing Amount", - "Settle Amount", "Surcharge", "GST", "Settle Date", "Exchange Rate", - "Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No","Incremental Surcharge"}; + "Settle Amount", "Surcharge", "Incremental Surcharge", "GST", "Settle Date", "Exchange Rate", + "Transaction Type", "Clearing Status", "Gateway", "Remark", "Dev No"}; for (int j = 0; j < title.length; j++) { row.createCell(j, Cell.CELL_TYPE_STRING).setCellValue(title[j]); } diff --git a/src/main/ui/index.html b/src/main/ui/index.html index 7962860a8..86826e2da 100644 --- a/src/main/ui/index.html +++ b/src/main/ui/index.html @@ -874,11 +874,11 @@ margin-bottom: 10%;"/> Orders -
  • + Incremental Orders + <!– –>Incremental Orders -
    • + -->
  • Settlement diff --git a/src/main/ui/static/invoice/invoice_assistant.js b/src/main/ui/static/invoice/invoice_assistant.js index c988293c4..938e7b61c 100644 --- a/src/main/ui/static/invoice/invoice_assistant.js +++ b/src/main/ui/static/invoice/invoice_assistant.js @@ -151,7 +151,6 @@ define(['angular','decimal'], function (angular,decimal) { '
    手续费组成
    '+'
    '+ '

    system:'+ system_surcharge +'

    ' + '

    '+channel+':'+ incremental_surcharge +'

    '; - debugger; var a = royal_surcharge+incremental_surcharge+channel_surcharge+tax_amount; if(total_surcharge <= (royal_surcharge+incremental_surcharge+channel_surcharge+tax_amount)){ tip = tip +'

    tax amount:'+ tax_amount +'

    ';