【R】商户端&运营端订单source处理 fix

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"};
+                    "Input Amount", "Total Amount", "Clearing Amount", "Sruchange Rate", "Settle Amount", "Remark", "Dev No","Incremental Surcharge"};
             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,6 +870,7 @@ 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++) {

src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml

@@ -949,7 +949,7 @@
     <select id="listTransactionsOfClearingOrder" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT t.*,
-        IFNULL(t.incremental_surcharge, 0.00),
+        IFNULL(t.incremental_surcharge, 0.00) incremental_surcharge_settle,
                o.display_amount,
                o.client_order_id,
                o.gateway,