Upd:优化风控相关功能

5 years ago · aceb124d3d
parent 518f36d51e
commit aceb124d3d
3 changed files with 12 additions and 4 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
@ -792,6 +792,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
        ctx.setVariable("order_type", event.getIntValue("order_type"));
        ctx.setVariable("bdNamesStr", bdNamesStr);
        ctx.setVariable("reply_date", reply_date);
+        ctx.setVariable("is_resend",new Date().compareTo(event.getDate("reply_email_date")) < 0);
        ctx.setVariable("reply_date_english", reply_date_english);
        ctx.setVariable("client", client);
        ctx.setVariable("uploadUrl", uploadUrl);
--- a/src/main/resources/templates/mail/risk_urge_mail.html
+++ b/src/main/resources/templates/mail/risk_urge_mail.html
@ -1,7 +1,13 @@
 <html xmlns:th="http://www.thymeleaf.org" lang="zh">
 <b>Dear RoyalPay Merchant/BD :</b>
-<p>您好，您的风控材料—<span th:text="${client.company_name}"></span> 【<span th:text="${client.client_moniker}"></span>】提交期限即将于<span style="background: #FCE824" th:text="${reply_date}"></span>到期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。</p>
-<p>Your deadline for submission of risk materials for <span th:text="${client.company_name}"></span>【<span th:text="${client.client_moniker}"></span>】 is about to expire by <span th:text="${reply_date_english}" style="background: #FCE824"></span>, please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.</p>
+<p>您好，您的风控材料—<span th:text="${client.company_name}"></span> 【<span th:text="${client.client_moniker}"></span>】
+    <span th:text="${!client.is_resend}">已逾期</span>
+    <span th:text="${client.is_resend}">提交期限即将于<span style="background: #FCE824" th:text="${reply_date}"></span>到期</span>
+    ，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。</p>
+<p>Your deadline for submission of risk materials for <span th:text="${client.company_name}"></span>【<span th:text="${client.client_moniker}"></span>】
+    <span th:text="${!client.is_resend}">has expired</span>
+    <span th:text="${client.is_resend}">is about to expire by <span th:text="${reply_date_english}" style="background: #FCE824"></span></span>
+    , please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.</p>
 <h4>Best Regards</h4>
 <p>
    <img style="width: 120px;height: 120px"
@ -9,7 +15,7 @@
    Contact Us<br>
    Email:<br>
    <a href="mailto:info@royalpay.com.au">info@royalpay.com.au</a> <br>
-    Tel:<br>
+    Tel:<br>与调查交易金额对应的购物小票/发票存根照片 要求：照片应清晰
    1300 10 77 50<br>
    <br>
    Service WeChat Account:<br>
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@ -367,6 +367,7 @@
                                                </tr>
                                                </tbody>
                                            </table>
+                                            <p ng-if="tradeLogs.length != 0" style="text-align: center;margin: 5px 9px">共计<span>{{tradeLogs.length}}</span>条</p>
                                        </div>
                                    </div>

@ -383,7 +384,7 @@
                                    </a>

                                    <a role="button"
-                                       ui-sref="analysis_monitoring.risk_business"
+                                       ng-click="goBack()"
                                       class="btn btn-info pull-right">返回
                                    </a>