From c8fd66d3ad0ac434f4f53321bdd6a8aec2abba11 Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 19 Mar 2019 11:15:11 +0800 Subject: [PATCH 1/2] hanyin reports --- .../payment/manage/system/core/beans/TradeSecureFile.java | 7 +++++-- .../payment/manage/mappers/payment/TransactionMapper.xml | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/system/core/beans/TradeSecureFile.java b/src/main/java/au/com/royalpay/payment/manage/system/core/beans/TradeSecureFile.java index 339a257c8..c875fc9a3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/system/core/beans/TradeSecureFile.java +++ b/src/main/java/au/com/royalpay/payment/manage/system/core/beans/TradeSecureFile.java @@ -110,6 +110,7 @@ public class TradeSecureFile { private BigDecimal exchangeRate; private String transactionType; private Date transactionTime; + private String ip; public TradeItem(JSONObject item) { clientMoniker = item.getString("client_moniker"); @@ -122,11 +123,13 @@ public class TradeSecureFile { clearingAmount = CurrencyAmountUtils.scale(item.getBigDecimal("clearing_amount"), PlatformEnvironment.getEnv().getForeignCurrency()); exchangeRate = item.getBigDecimal("exchange_rate"); transactionTime = item.getDate("transaction_time"); + ip = item.getString("customer_ip"); } public String line() { - String[] columns = {clientMoniker, orderId, channel, gateway.toString(), price.toPlainString(), clearingAmount.toPlainString(), currency, - exchangeRate.toPlainString(), filterStatus(), new DateTime(transactionTime).withZone(zone).toString("yyyy-MM-dd HH:mm:ss")}; + String[] columns = {clientMoniker, orderId, channel, gateway.toString(), price.toPlainString(), + clearingAmount.toPlainString(), currency, exchangeRate.toPlainString(), filterStatus(), + new DateTime(transactionTime).withZone(zone).toString("yyyy-MM-dd HH:mm:ss"), ip}; return String.join("|", columns); } 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 0e456d517..6ee34dcd2 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 @@ -1008,6 +1008,7 @@ select c.client_moniker, o.order_id, o.gateway, + o.customer_ip, t.transaction_amount, t.transaction_currency, t.order_channel, @@ -1027,6 +1028,7 @@ select c.client_moniker, o.order_id, o.gateway, + o.customer_ip, r.out_refund_id, t.transaction_amount, t.transaction_currency, From 4e150e4555964d81909d78507d5bb48a4cfda54e Mon Sep 17 00:00:00 2001 From: "taylor.dang" Date: Tue, 19 Mar 2019 23:09:18 +0800 Subject: [PATCH 2/2] update --- src/main/ui/static/templates/payment/v1/payment.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/ui/static/templates/payment/v1/payment.js b/src/main/ui/static/templates/payment/v1/payment.js index a078c0add..829de19d1 100644 --- a/src/main/ui/static/templates/payment/v1/payment.js +++ b/src/main/ui/static/templates/payment/v1/payment.js @@ -357,14 +357,6 @@ $(function () { buildDialog(config.template); } - function inputRemark() { - var config = { - template: "请先输入备注" - } - buildDialog(config); - - } - function buildDialog(template) { var defaultConfig = {backdrop: true}; config = $.extend({}, defaultConfig, config);