diff --git a/pom.xml b/pom.xml index b9e26810d..c7269bb24 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 1.4.30 + 1.4.31 UTF-8 1.8.0 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 5eac63bed..5d48e8e1c 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 @@ -851,10 +851,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider } List transactions = transactionMapper.listTransactionsOfClearingOrder(clearClient.getIntValue("clear_detail_id"), new PageBounds(Order.formString("order_id.asc"))); - - for (JSONObject transaction : transactions) { - transaction.put("rate_value", StringUtils.defaultString(clientIncrementalMapper.findByChannelAndClientId(transaction.getIntValue("client_id"), transaction.getString("source")), "0")); - } String timezone_client = client.getString("timezone"); if (timezone_client != null) { transactions.parallelStream().forEach(p -> { diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java index 0e237c899..b9f662bc0 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientIncrementalMapper.java @@ -48,9 +48,6 @@ public interface ClientIncrementalMapper { @AutoSql(type = SqlType.UPDATE) void update(JSONObject saveIncrementalService); - @AutoSql(type = SqlType.SELECT) - String findByChannelAndClientId(@Param("client_id") int clientId,@Param("channel") String channel); - @AutoSql(type = SqlType.SELECT) List find(@Param("client_id") int clientId); } 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 fcc6e4a94..aeb24fa8c 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 @@ -270,9 +270,6 @@ public class TradeLogServiceImpl implements TradeLogService { }}); } PageList logs = orderMapper.listIncrementalOrders(params, new PageBounds(query.getPage(), query.getLimit(), Order.formString("create_time.desc"))); - for (JSONObject log : logs) { - log.put("rate_value", clientIncrementalMapper.findByChannelAndClientId(log.getIntValue("client_id"), log.getString("source"))); - } JSONObject result = PageListUtils.buildPageListResult(logs); JSONObject analysis = orderMapper.analysisOrders(params); result.put("analysis", analysis); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 6aa7d2669..c009f4864 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -292,6 +292,7 @@ + ,ifnull(sci.incremental_rate_value,0) as rate_value FROM ( select oo.order_id,oo.client_id,oo.total_amount,oo.display_amount, oo.customer_payment_amount,oo.coupon_payment_amount,oo.currency, @@ -366,6 +367,7 @@ ON t.order_id = o.order_id AND t.refund_id IS NULL AND t.transaction_type = 'Credit' + LEFT JOIN sys_client_incremental sci on sci.client_id = o.client_id diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml index d233cad01..d8785a7d8 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/TransactionMapper.xml @@ -1154,10 +1154,12 @@ r.client_refund_id, o.order_detail, o.dev_id, - o.source + o.source, + ifnull(sci.incremental_rate_value,0) as rate_value FROM pmt_transactions t LEFT JOIN pmt_orders o ON o.order_id = t.order_id LEFT JOIN pmt_refunds r ON r.refund_id = t.refund_id + LEFT JOIN sys_client_incremental sci on sci.client_id = t.client_id WHERE t.channel != 'Settlement' AND t.clearing_order = #{clearing_order} ]]> diff --git a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html index 678a51955..6ef529447 100644 --- a/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html +++ b/src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html @@ -380,8 +380,14 @@ {{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}% {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} - {{trade.source}}:{{(trade.rate_value) | number : 2}}% - {{trade.source}}:{{trade.incremental_surcharge | currency:trade.currency}}{{0.00 | currency:trade.currency}} + + {{trade.source}}:{{(trade.rate_value) | number : 2}}% + {{trade.source}}:0.00% + + {{trade.source}}: + {{trade.incremental_surcharge | currency:trade.currency}} + {{0.00 | currency:trade.currency}} + diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 8f636098e..e00505534 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -143,6 +143,16 @@ +
diff --git a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html index af1b126c8..da3881451 100644 --- a/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html @@ -397,8 +397,14 @@ {{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}% {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} - {{trade.source}}:{{(trade.rate_value) | number : 2}}% - {{trade.source}}:{{trade.incremental_surcharge | currency:trade.currency}} + + {{trade.source}}:{{(trade.rate_value) | number : 2}}% + {{trade.source}}:0.00% + + + {{trade.source}}:{{trade.incremental_surcharge | currency:trade.currency}} + {{0.00 | currency:trade.currency}} + diff --git a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html index 3f596ccd8..bcbf4d146 100644 --- a/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html +++ b/src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html @@ -350,8 +350,14 @@ {{(trade.surcharge_rate * 100 - trade.rate_value)| number : 2}}% {{(trade.total_surcharge-trade.incremental_surcharge) | number : 2 | currency:trade.currency}} - {{trade.source}}:{{(trade.rate_value) | number : 2}}% - {{trade.source}}:{{trade.incremental_surcharge | currency:trade.currency}}{{0.00 | currency:trade.currency}} + + {{trade.source}}:{{(trade.rate_value) | number : 2}}% + {{trade.source}}:0.00% + + {{trade.source}}: + {{trade.incremental_surcharge | currency:trade.currency}} + {{0.00 | currency:trade.currency}} +