From efabb145b0b53c738fa00f971d890891988817c5 Mon Sep 17 00:00:00 2001 From: yixian Date: Thu, 6 Aug 2020 17:48:09 +1000 Subject: [PATCH] risk event form optmise --- src/main/ui/static/analysis/risk_business.js | 84 +++++++++--- .../analysis/templates/new_riskEvent.html | 33 ++--- .../analysis/templates/riskEvent_detail.html | 127 ++++++++++-------- .../analysis/templates/risk_business.html | 2 +- 4 files changed, 153 insertions(+), 93 deletions(-) diff --git a/src/main/ui/static/analysis/risk_business.js b/src/main/ui/static/analysis/risk_business.js index 432c1fcf9..b36e56413 100644 --- a/src/main/ui/static/analysis/risk_business.js +++ b/src/main/ui/static/analysis/risk_business.js @@ -5,40 +5,79 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], function (angular, $) { 'use strict'; - let mailTemplate = { + const mailTemplate = { "1": "代购、综合商城类", "2": "飞机票、旅行社类", "3": "教育类、中介类", "4": "Chargeback" }; - - let orderTypesMap = { - "1": "微信调单", - "2": "支付宝调单", - "3": "RoyalPay调单", - "4": "警告", - "5": "通用号调单", - "6": "卡支付ChargeBack" + const orderTypesProfiles = { + "1": { + label: "微信调单", + platform_trans_textarea: true, + company_name_required: true, + sub_mch_id_required: true, + partner_code_required: true, + date_label: 'Receive Date', + can_send_to_mch: true + }, + "2": { + label: "支付宝调单", + platform_trans_textarea: true, + partner_code_required: true, + date_label: 'Receive Date', + require_material: true, + can_send_to_mch: true + }, + "3": { + label: "RoyalPay调单", + platform_trans_textarea: true, + send_clean_days: true, + rp_order_type: true, + partner_code_required: true, + date_label: 'Create Date', + can_send_to_mch: true + }, + "4": { + label: "警告", + warning_type_required: true, + partner_code_required: true, + date_label: 'Create Date', + can_send_to_mch: true + }, + "5": { + label: "通用号调单", + platform_trans_textarea: true, + sub_mch_id_required: true, + date_label: 'Create Date' + }, + "6": { + label: "卡支付ChargeBack", + single_channel_order: true, + date_label: 'Receive Date', + can_send_to_mch: true, + require_result: true + } }; - let orderTypesMapForBD = { + const orderTypesMapForBD = { "1": "微信调单", "2": "支付宝调单", "3": "RoyalPay调单" }; - let royalpayOrderTypesMap = { + const royalpayOrderTypesMap = { "0": "正常调单", "1": "单纯大金额频繁刷单" }; - let warningOrderTypesMap = { + const warningOrderTypesMap = { "0": "单人多次大金额交易", "1": "退款频繁" }; - let resultTypesMap = { + const resultTypesMap = { "0": "未处理", "1": "已发送邮件", "2": "已提交材料，等待审核", @@ -47,7 +86,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], "5": "已处理" }; - let resultTypeSearchMap = { + const resultTypeSearchMap = { "0": "未处理", "1": "资料完善中", "2": "等待风控", @@ -56,7 +95,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], "5": "已处理" }; - let resultTypeSearchMapForBD = { + const resultTypeSearchMapForBD = { "1": "材料待上传", "2": "材料已提交", "3": "风控初审完成，渠道方审核中", @@ -64,14 +103,14 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], "5": "已处理" }; - let emailStatusMap = { + const emailStatusMap = { "0": "未发送", "1": "已发送", "2": "打回并已发送", "3": "已发送催促邮件" }; - let amountSectionMap = { + const amountSectionMap = { "0-500": "0-500", "500-1000": "500-1000", "1000-1500": "1000-1500", @@ -83,7 +122,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], "4000-4500": "4000-4500" }; - let channelResultArray = [ + const channelResultArray = [ "关闭支付", "恢复支付", "单日10", @@ -141,7 +180,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], app.controller('riskBusinessCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', 'industryMap', 'chartParser', function ($scope, $state, $http, $uibModal, $filter, commonDialog, industryMap, chartParser) { - $scope.orderTypes = orderTypesMap; + $scope.orderTypes = orderTypesProfiles; $scope.orderTypesForBD = orderTypesMapForBD; $scope.resultTypes = resultTypesMap; $scope.resultSearchTypes = resultTypeSearchMap; @@ -284,7 +323,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], $scope.ctrl = { editRemark: false }; - $scope.orderTypes = orderTypesMap; + $scope.orderTypes = orderTypesProfiles; $scope.mailTemplate = mailTemplate; $scope.resultTypes = resultTypesMap; $scope.channelResults = channelResultArray; @@ -742,7 +781,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], function ($scope, $state, $http, $uibModal, $filter, commonDialog) { $scope.receive_email_date = new Date(); $scope.today = new Date(); - $scope.orderTypes = orderTypesMap; + $scope.orderTypes = orderTypesProfiles; $scope.mailTemplate = mailTemplate; $scope.royapayOrderTypes = royalpayOrderTypesMap; $scope.warningOrderTypes = warningOrderTypesMap; @@ -908,7 +947,8 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], // 调单类型过滤器 app.filter('orderType', function () { return function (type) { - return orderTypesMap[type]; + let profile = orderTypesProfiles[type]; + return profile == null ? null : profile.label; } }); diff --git a/src/main/ui/static/analysis/templates/new_riskEvent.html b/src/main/ui/static/analysis/templates/new_riskEvent.html index 15cc552ee..75d7172a2 100644 --- a/src/main/ui/static/analysis/templates/new_riskEvent.html +++ b/src/main/ui/static/analysis/templates/new_riskEvent.html @@ -21,7 +21,7 @@ ng-model="riskEvent.order_type" id="order-type-input" required - ng-options="key as value for (key, value) in orderTypes"> + ng-options="key as value.label for (key, value) in orderTypes">
+ ng-if="orderTypes[riskEvent.order_type].send_clean_days && riskEvent.royalpay_order_type==1">
@@ -112,7 +112,7 @@
+ ng-if="(partners != null) && (partners.length > 0) && orderTypes[riskEvent.order_type].company_name_required"> @@ -135,7 +135,7 @@
@@ -188,7 +188,7 @@
-
@@ -205,7 +205,7 @@
+ ng-if="orderTypes[riskEvent.order_type].single_channel_order && riskEvent.order_ids">
@@ -213,14 +213,15 @@
+ ng-if="orderTypes[riskEvent.order_type].single_channel_order && riskEvent.client_moniker">
-
+
@@ -256,7 +257,7 @@
@@ -286,7 +287,7 @@
+ ng-if="orderTypes[riskEvent.order_type].require_material">
-
+
-
+

@@ -98,7 +99,8 @@

-
+

-
+

@@ -181,7 +184,8 @@

-
+
-
+
-
- -
-
- -
- -
- -
-
- -
-
- -
-
- +
+
+ + + + + + +
@@ -447,7 +447,7 @@ ng-model="riskEventEdit.order_type" id="order-type-input" required - ng-options="key as value for (key, value) in orderTypes"> + ng-options="key as value.label for (key, value) in orderTypes"> @@ -461,7 +461,7 @@
+
+ +
+

+
+
+ +
+

+ {{riskEvent.order_ids}} +

+
+
+ +