From b71cfdaa5c89eadd2f19a9f01406a98262b01475 Mon Sep 17 00:00:00 2001
From: wangning <164851225@qq.com>
Date: Sat, 28 Apr 2018 17:15:41 +0800
Subject: [PATCH] update

---
 .../risk/core/impl/RiskMerchantServiceImpl.java    | 14 +++++++-------
 src/main/ui/static/risk/templates/risk.html        |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java
index 8d99a5afe..d62762e94 100644
--- a/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java
@@ -74,7 +74,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         detail.put("client_id", riskRecord.getIntValue("client_id"));
         detail.put("auditor", account.getString("display_name"));
         detail.put("auditor_id", account.getString("manager_id"));
-        detail.put("operation", "进行掉单处理");
+        detail.put("remark", "进行掉单处理");
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
     }
@@ -97,7 +97,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         detail.put("record_id", recordId);
         detail.put("client_id", riskRecord.getIntValue("client_id"));
         detail.put("auditor", account.getString("display_name"));
-        detail.put("operation", "不做处理");
+        detail.put("remark", "不做处理");
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
     }
@@ -112,22 +112,22 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         if (record.getIntValue("status") != 0) {
             throw new BadRequestException("The Record Has Been Handled");
         }
-        String operation = "";
+        String remark = "";
         if (dealRiskRecord.getLimitAmount() != null) {
             clientManager.setMaxOrderAmount(record.getString("client_moniker"), dealRiskRecord.getLimitAmount());
-            operation = operation + "限额" + dealRiskRecord.getLimitAmount();
+            remark = remark + "限额" + dealRiskRecord.getLimitAmount();
 
         }
         if (dealRiskRecord.getDisableMerchat()) {
             clientManager.switchChannelPermission(account, record.getString("client_moniker"), "Wechat", false);
             clientManager.switchChannelPermission(account, record.getString("client_moniker"), "Alipay", false);
-            operation = operation + "   关闭支付通道";
+            remark = remark + "   关闭支付通道";
         }
         JSONObject detail = new JSONObject();
         detail.put("record_id", dealRiskRecord.getRecordId());
         detail.put("client_id", record.getIntValue("client_id"));
         detail.put("auditor", account.getString("display_name"));
-        detail.put("operation", StringUtils.isEmpty(operation) ? null : (operation = "处理结果:" + operation));
+        detail.put("remark", StringUtils.isEmpty(remark) ? null : (remark = "处理结果:" + remark));
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
         record.put("status", 2);
@@ -149,7 +149,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService {
         detail.put("client_id", record.getIntValue("client_id"));
         detail.put("auditor", account.getString("display_name"));
         detail.put("auditor_id", account.getString("manager_id"));
-        detail.put("operation", "关结");
+        detail.put("remark", "结停");
         detail.put("create_time", new Date());
         riskMerchantDetailLogMapper.save(detail);
         JSONObject recordUpdate = new JSONObject();
diff --git a/src/main/ui/static/risk/templates/risk.html b/src/main/ui/static/risk/templates/risk.html
index f5cd1f7da..ff55c8552 100644
--- a/src/main/ui/static/risk/templates/risk.html
+++ b/src/main/ui/static/risk/templates/risk.html
@@ -14,7 +14,7 @@
                     <thead>
                     <tr>
                         <th>Client Moniker</th>
-                        <th>Create Time</th>r
+                        <th>Create Time</th>
                         <th>Waring Time</th>
                         <th>Status</th>
                         <th>Risk Types</th>