From b5e44dbfc5284c3a74953d929692148a0b94b58b Mon Sep 17 00:00:00 2001
From: "james.zhao" <james.zhao@globalfreepay.com>
Date: Wed, 17 Oct 2018 14:52:10 +0800
Subject: [PATCH] update

---
 .../templates/mail/risk_upload_mail.html      |  4 +-
 src/main/ui/static/analysis/risk_business.js  | 24 +++++++++
 .../analysis/templates/new_riskEvent.html     | 49 ++++++++++++++++++-
 .../analysis/templates/riskEvent_detail.html  | 20 +++++++-
 4 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html
index 24b1c62a3..cf71b3cf8 100644
--- a/src/main/resources/templates/mail/risk_upload_mail.html
+++ b/src/main/resources/templates/mail/risk_upload_mail.html
@@ -60,8 +60,8 @@
 <div th:if="${order_type==4}">
     <b>尊敬的RoyalPay商户 :<br>
     Dear RoyalPay merchant :</b>
-    <p>我司风控系统检测到您短期内后台交易存在异常行为（<span th:if="${warning_order_type==0}">单人多次大金额交易</span><span th:if="${warning_order_type==1}">退款频繁</span>），触发平台风控预警，特此提醒：请勿使用平台进行违规交易，一经核查将关闭支付权限。请知悉。<br>
-        RoyalPay's risk management system has identified abnormal transactions from your records in a short time(<span th:if="${warning_order_type==0}">Single person pays large sums several times</span><span th:if="${warning_order_type==1}">frequent refund transactions</span>),which triggered the platform risk control warning. Here reminds: Do not use the platform for illegal transactions. Once verified, the payment authority will be closed. </p>
+    <p>我司风控系统检测到您短期内后台交易存在异常行为（<span th:if="${warning_order_type==0}" style="background: #FCE824">单人多次大金额交易</span><span th:if="${warning_order_type==1}" style="background: #FCE824">退款频繁</span>），触发平台风控预警，特此提醒：请勿使用平台进行违规交易，一经核查将关闭支付权限。请知悉。<br>
+        RoyalPay's risk management system has identified abnormal transactions from your records in a short time(<span th:if="${warning_order_type==0}" style="background: #FCE824">Single person pays large sums several times</span><span th:if="${warning_order_type==1}" style="background: #FCE824">frequent refund transactions</span>),which triggered the platform risk control warning. Here reminds: Do not use the platform for illegal transactions. Once verified, the payment authority will be closed. </p>
 </div>
 <p>顺颂商祺<br>
     Sincerely
diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js
index aeeb5907a..323168aa2 100644
--- a/src/main/ui/static/analysis/risk_business.js
+++ b/src/main/ui/static/analysis/risk_business.js
@@ -12,6 +12,16 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
             "5": "通用号调单"
         };
 
+        var royalpayOrderTypesMap = {
+            "0": "正常调单",
+            "1": "单纯大金额频繁刷单"
+        };
+
+        var warningOrderTypesMap = {
+            "0": "单人多次大金额交易",
+            "1": "退款频繁"
+        };
+
         var resultTypesMap = {
             "0": "未处理",
             "1": "已发送邮件至BD",
@@ -287,6 +297,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
 
                 $scope.today = new Date();
                 $scope.orderTypes = orderTypesMap;
+                $scope.royapayOrderTypes = royalpayOrderTypesMap;
+                $scope.warningOrderTypes = warningOrderTypesMap;
 
                 $scope.save = function(form) {
                     if (form.$invalid) {
@@ -332,6 +344,18 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
             }
         });
 
+        app.filter('royalPayOrderType', function() {
+            return function(type) {
+                return royalpayOrderTypesMap[type];
+            }
+        });
+
+        app.filter('warningOrderType', function() {
+            return function(type) {
+                return warningOrderTypesMap[type];
+            }
+        });
+
         // 处理结果过滤器
         app.filter('resultType', function() {
             return function(type) {
diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html
index 9f665f80b..a860f342c 100644
--- a/src/main/ui/static/analysis/templates/new_riskEvent.html
+++ b/src/main/ui/static/analysis/templates/new_riskEvent.html
@@ -32,6 +32,52 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="form-group"
+                                 ng-if="riskEvent.order_type == 3"
+                                 ng-class="{'has-error':riskEventForm.royalpay_order_type.$invalid && riskEventForm.royalpay_order_type.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="royalpay-order-type-input">Royalpay Order Type
+                                </label>
+                                <div class="col-sm-8">
+                                    <select class="form-control"
+                                            name="royalpay_order_type"
+                                            ng-model="riskEvent.royalpay_order_type"
+                                            id="royalpay-order-type-input"
+                                            required
+                                            ng-options="key as value for (key, value) in royapayOrderTypes">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="riskEventForm.royalpay_order_type.$error"
+                                         ng-if="riskEventForm.royalpay_order_type.$dirty">
+                                        <p class="small text-danger"
+                                           ng-message="required">required field
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group"
+                                 ng-if="riskEvent.order_type == 4"
+                                 ng-class="{'has-error':riskEventForm.warning_order_type.$invalid && riskEventForm.warning_order_type.$dirty}">
+                                <label class="control-label col-sm-2"
+                                       for="warning-order-type-input">Warning Type
+                                </label>
+                                <div class="col-sm-8">
+                                    <select class="form-control"
+                                            name="warning_order_type"
+                                            ng-model="riskEvent.warning_order_type"
+                                            id="warning-order-type-input"
+                                            required
+                                            ng-options="key as value for (key, value) in warningOrderTypes">
+                                        <option value="">Please Choose</option>
+                                    </select>
+                                    <div ng-messages="riskEventForm.warning_order_type.$error"
+                                         ng-if="riskEventForm.warning_order_type.$dirty">
+                                        <p class="small text-danger"
+                                           ng-message="required">required field
+                                        </p>
+                                    </div>
+                                </div>
+                            </div>
                             <div class="form-group"
                                  ng-if="riskEvent.order_type != 5"
                                  ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
@@ -74,6 +120,7 @@
                                            type="text"
                                            name="order_ids"
                                            id="order-ids-input"
+                                           placeholder="order id1,order id2,order id3..."
                                            required>
                                     <div ng-messages="riskEventForm.order_ids.$error"
                                          ng-if="riskEventForm.order_ids.$dirty">
@@ -148,4 +195,4 @@
             </button>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html
index e890e7173..5217373e6 100644
--- a/src/main/ui/static/analysis/templates/riskEvent_detail.html
+++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html
@@ -74,6 +74,24 @@
                                                     </div>
                                                 </div>
 
+                                                <div class="form-group" ng-if="riskEvent.order_type == 3">
+                                                    <label class="control-label col-sm-2">Royalpay Order Type</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.royalpay_order_type | royalPayOrderType">
+                                                        </p>
+                                                    </div>
+                                                </div>
+
+                                                <div class="form-group" ng-if="riskEvent.order_type == 4">
+                                                    <label class="control-label col-sm-2">Waning Order Type</label>
+                                                    <div class="col-sm-10">
+                                                        <p class="form-control-static"
+                                                           ng-bind="riskEvent.warning_order_type | warningOrderType">
+                                                        </p>
+                                                    </div>
+                                                </div>
+
                                                 <div class="form-group">
                                                     <label class="control-label col-sm-2">Result Type</label>
                                                     <div class="col-sm-10">
@@ -234,7 +252,7 @@
                                     </div>
 
                                     <a role="button"
-                                       ng-if="riskEvent.result_type <= 1"
+                                       ng-if="riskEvent.result_type <= 1 && riskEvent.order_type < 4"
                                        class="btn btn-info"
                                        ng-click="resendUploadEmail()">Send Email {{riskEvent.result_type == 1 ? 'again' : ''}}
                                     </a>