Merge branch 'develop'

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);
         }
 

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,

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);