msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
master
yixian 4 years ago
parent 98b117c87a efabb145b0
commit b6cecf086a
4 changed files with 153 additions and 93 deletions
Show Stats Download Patch File Download Diff File

84
src/main/ui/static/analysis/risk_business.js
Unescape View File

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

33
src/main/ui/static/analysis/templates/new_riskEvent.html
Unescape View File

@ -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">
<option value="">Please Choose</option>
</select>
<div ng-messages="riskEventForm.order_type.$error"
@ -33,7 +33,7 @@
</div>
</div>
<div class="form-group"
ng-if="riskEvent.order_type == 3"
ng-if="orderTypes[riskEvent.order_type].rp_order_type"
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
@ -56,7 +56,7 @@
</div>
</div>
<div class="form-group"
ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
ng-if="orderTypes[riskEvent.order_type].send_clean_days && riskEvent.royalpay_order_type==1">
<label class="control-label col-sm-2">是否发送清算周期变更</label>
<div class="col-xs-6">
<input type="checkbox"
@ -66,7 +66,7 @@
</div>
</div>
<div class="form-group"
ng-if="riskEvent.order_type == 4"
ng-if="orderTypes[riskEvent.order_type].warning_type_required"
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
@ -90,7 +90,7 @@
</div>
<div class="form-group"
ng-if="riskEvent.order_type == 5 || riskEvent.order_type == 1"
ng-if="orderTypes[riskEvent.order_type].sub_mch_id_required"
ng-class="{'has-error':riskEventForm.sub_merchant_id.$invalid && riskEventForm.sub_merchant_id.$dirty}">
<label class="control-label col-sm-2"
for="sub-merchant-id-input">Sub Merchant ID</label>
@ -112,7 +112,7 @@
</div>
<div class="form-group"
ng-if="(partners != null) && (partners.length > 0) && riskEvent.order_type == 1">
ng-if="(partners != null) && (partners.length > 0) && orderTypes[riskEvent.order_type].company_name_required">
<label class="control-label col-sm-2"
for="order-type-input">Company Name
</label>
@ -135,7 +135,7 @@
</div>
<div class="form-group"
ng-if="riskEvent.order_type != 5 && riskEvent.order_type!=6"
ng-if="orderTypes[riskEvent.order_type].partner_code_required"
ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
<label class="control-label col-sm-2"
for="short-id-input">Partner Code
@ -166,7 +166,7 @@
</div>
<div class="form-group"
ng-if="riskEvent.order_type != 4 && riskEvent.order_type!=6"
ng-if="orderTypes[riskEvent.order_type].platform_trans_textarea"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
<label class="control-label col-sm-2"
for="order-ids-input">Platform Transaction IDs</label>
@ -188,7 +188,7 @@
</div>
</div>
</div>
<div class="form-group" ng-if="riskEvent.order_type==6"
<div class="form-group" ng-if="orderTypes[riskEvent.order_type].single_channel_order"
ng-class="{'has-error':riskEventForm.channel_order_id.$invalid && riskEventForm.channel_order_id.$dirty}">
<label class="control-label col-sm-2" for="channel-order-id-input">Channel Transaction
ID</label>
@ -205,7 +205,7 @@
</div>
</div>
<div class="form-group"
ng-if="riskEvent.order_type == 6 && riskEvent.order_ids">
ng-if="orderTypes[riskEvent.order_type].single_channel_order && riskEvent.order_ids">
<label class="control-label col-sm-2"
for="order-ids-input">Platform Transaction ID</label>
<div class="col-sm-8">
@ -213,14 +213,15 @@
</div>
</div>
<div class="form-group"
ng-if="riskEvent.order_type == 6 && riskEvent.client_moniker">
ng-if="orderTypes[riskEvent.order_type].single_channel_order && riskEvent.client_moniker">
<label class="control-label col-sm-2"
for="order-ids-input">Client</label>
<div class="col-sm-8">
<div class="form-control-static" ng-bind="riskEvent.client_moniker"></div>
</div>
</div>
<div class="row" ng-if="riskEvent.order_type==6 && channel_orders && !riskEvent.order_ids">
<div class="row"
ng-if="orderTypes[riskEvent.order_type].single_channel_order && channel_orders && !riskEvent.order_ids">
<div class="col-sm-12 table-responsive">
<table class="table table-bordered table-striped">
<thead>
@ -256,7 +257,7 @@
<div class="form-group">
<label class="control-label col-sm-2"
for="receive-date-input">
{{(riskEvent.order_type == 1 || riskEvent.order_type == 2) ? 'Receive Date' : 'Create Date'}}
{{orderTypes[riskEvent.order_type].date_label}}
</label>
<div class="col-xs-2">
<input class="form-control"
@ -265,7 +266,7 @@
ng-model="receive_email_date"
uib-datepicker-popup
size="10"
placeholder="{{(riskEvent.order_type == 1 || riskEvent.order_type ==2) ? 'Receive Date' : 'Create Date'}}"
placeholder="{{orderTypes[riskEvent.order_type].date_label}}"
datepicker-options="{maxDate:today}"
is-open="ReceiveDate.open"
ng-click="ReceiveDate.open=true">
@ -286,7 +287,7 @@
</div>
<div class="form-group" ng-repeat="material in materials"
ng-if="riskEvent.order_type == 2">
ng-if="orderTypes[riskEvent.order_type].require_material">
<label class="control-label col-sm-2"
for="material{{$index+1}}">Material{{$index + 1}}
@ -333,7 +334,7 @@
</div>
</div>
<div class="form-group" ng-if="riskEvent.order_type != 5">
<div class="form-group" ng-if="orderTypes[riskEvent.order_type].can_send_to_mch">
<label class="control-label col-sm-2">是否发送商户</label>
<div class="col-xs-6">
<input type="checkbox"

89
src/main/ui/static/analysis/templates/riskEvent_detail.html
Unescape View File

@ -71,7 +71,8 @@
</div>
</div>
<div class="form-group" ng-if="riskEvent.order_type == 1 || riskEvent.order_type == 5">
<div class="form-group"
ng-if="orderTypes[riskEvent.order_type].sub_mch_id_required">
<label class="control-label col-sm-2">Sub Merchant ID</label>
<div class="col-sm-10">
<p class="form-control-static">
@ -98,7 +99,8 @@
</div>
</div>
<div class="form-group" ng-if="riskEvent.order_type == 3">
<div class="form-group"
ng-if="orderTypes[riskEvent.order_type].rp_order_type">
<label class="control-label col-sm-2">Royalpay Order Type</label>
<div class="col-sm-10">
<p class="form-control-static"
@ -107,7 +109,8 @@
</div>
</div>
<div class="form-group" ng-if="riskEvent.order_type == 4">
<div class="form-group"
ng-if="orderTypes[riskEvent.order_type].warning_type_required">
<label class="control-label col-sm-2">Waning Order Type</label>
<div class="col-sm-10">
<p class="form-control-static"
@ -135,7 +138,7 @@
<div class="form-group">
<label class="control-label col-sm-2">
{{(riskEvent.order_type == 1 || riskEvent.order_type ==2) ? 'Receive Date' : 'Create Date'}}
{{orderTypes[riskEvent.order_type].date_label}}
</label>
<div class="col-sm-10">
<p class="form-control-static">
@ -181,7 +184,8 @@
</div>
</div>
<div class="form-group" ng-if="riskEvent.order_type ==3 && riskEvent.royalpay_order_type==1">
<div class="form-group"
ng-if="orderTypes[riskEvent.order_type].send_clean_days && riskEvent.royalpay_order_type==1">
<label class="control-label col-sm-2">是否发送清算周期变更</label>
<div class="col-xs-6">
<input type="checkbox"
@ -231,51 +235,47 @@
</div>
</div>
<div class="form-group" ng-if="riskEvent.result_type > 2">
<div class="form-group"
ng-if="riskEvent.result_type > 2 && ('10000000000'|withRole)">
<label class="control-label col-sm-2">Handle Result</label>
<div class="col-xs-2" ng-if="riskEvent.temporary_close_channel != 1 && enableChannel == 1">
<div class="col-xs-10">
<div class="btn-group">
<button class="btn btn-info"
type="button"
ng-click="updateChannel(riskEvent.order_type, false, false)"
ng-if="'10000000000'|withRole">关停渠道
ng-if="riskEvent.temporary_close_channel != 1 && enableChannel == 1"
ng-click="updateChannel(riskEvent.order_type, false, false)">
关停渠道
</button>
</div>
<div class="col-xs-2" ng-if="riskEvent.temporary_close_merchant != 1 && clientInfo.is_valid == 1">
<button class="btn btn-info"
type="button"
ng-click="updateClient(true, false)"
ng-if="'10000000000'|withRole">关停商户
ng-if="riskEvent.temporary_close_merchant != 1 && clientInfo.is_valid == 1">
关停商户
</button>
</div>
<div class="col-xs-2" ng-if="'10000000000'|withRole">
<button class="btn btn-info"
ng-if="enableChannel == 0"
type="button"
ng-click="updateChannel(riskEvent.order_type, true, false)">
重新启用渠道
</button>
</div>
<div class="col-xs-2" ng-if="clientInfo.is_valid == 0">
<button class="btn btn-info"
type="button"
ng-click="updateClient(false, false)"
ng-if="'10000000000'|withRole">重新启用商户
ng-if="clientInfo.is_valid == 0">重新启用商户
</button>
</div>
<div class="col-xs-2"
ng-if="riskEvent.order_type==6 && ('10000000000'|withRole)">
<button class="btn btn-info" type="button"
ng-click="commitChargebackStatus('ACCEPTED')">放弃申诉
<button class="btn btn-danger" type="button"
ng-if="orderTypes[riskEvent.order_type].require_result"
ng-click="commitChargebackStatus('ACCEPTED')">
放弃申诉
</button>
</div>
<div class="col-xs-2"
ng-if="riskEvent.order_type==6 && ('10000000000'|withRole)">
<button class="btn btn-info" type="button"
ng-click="commitChargebackStatus('DECLINED')">申诉成功
<button class="btn btn-success" type="button"
ng-if="orderTypes[riskEvent.order_type].require_result"
ng-click="commitChargebackStatus('DECLINED')">
申诉成功
</button>
</div>
</div>
</div>
<div class="form-group" ng-if="riskEvent.channel_result != null && ('10000000000'|withRole)">
<label class="control-label col-sm-2">Channel Handle Result</label>
@ -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">
<option value="">Please Choose</option>
</select>
@ -461,7 +461,7 @@
</div>
<div class="form-group"
ng-if="riskEventEdit.order_type != 5"
ng-if="orderTypes[riskEventEdit.order_type].partner_code_required"
ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}">
<label class="control-label col-sm-2"
for="short-id-input">* Partner Code
@ -492,7 +492,7 @@
</div>
<div class="form-group"
ng-if="riskEventEdit.order_type != 4"
ng-if="orderTypes[riskEventEdit.order_type].platform_trans_textarea"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
<label class="control-label col-sm-2"
for="order-ids-input">Platform Transaction IDs
@ -513,9 +513,27 @@
</div>
</div>
</div>
<div class="form-group"
ng-if="orderTypes[riskEventEdit.order_type].single_channel_order">
<label class="control-label col-sm-2">Partner Code</label>
<div class="col-sm-10">
<p class="form-control-static"
ng-bind="riskEvent.client_moniker"></p>
</div>
</div>
<div class="form-group"
ng-if="riskEventEdit.order_type == 5"
ng-if="orderTypes[riskEventEdit.order_type].single_channel_order">
<label class="control-label col-sm-2">Platform Transaction IDs</label>
<div class="col-sm-6">
<p class="form-control-static">
{{riskEvent.order_ids}}
</p>
</div>
</div>
<div class="form-group"
ng-if="orderTypes[riskEventEdit.order_type].sub_mch_id_required"
ng-class="{'has-error':riskEventForm.sub_merchant_id.$invalid && riskEventForm.sub_merchant_id.$dirty}">
<label class="control-label col-sm-2"
for="order-ids-input">Sub Merchant ID
@ -539,7 +557,7 @@
<div class="form-group">
<label class="control-label col-sm-2"
for="receive-email-input">
{{(riskEvent.order_type == 1 || riskEvent.order_type ==2) ? 'Receive Date' : 'Create Date'}}
{{orderTypes[riskEvent.order_type].date_label}}
</label>
<div class="col-sm-8">
<div style="display: inline-block">
@ -549,7 +567,7 @@
ng-model="riskEventEdit.receive_email_date"
uib-datepicker-popup
size="10"
placeholder="{{(riskEvent.order_type == 1 || riskEvent.order_type ==2) ? 'Receive Date' : 'Create Date'}}"
placeholder="{{orderTypes[riskEvent.order_type].date_label}}"
is-open="receiveDate.open"
ng-click="receiveDate.open=true"
datepicker-options="{maxDate:today}">
@ -617,7 +635,8 @@
</div>
<div class="form-group" ng-if="riskEvent.order_type != 5">
<div class="form-group"
ng-if="orderTypes[riskEventEdit.order_type].can_send_to_mch">
<label class="control-label col-sm-2">是否发送商户</label>
<div class="col-xs-6">
<input type="checkbox"

2
src/main/ui/static/analysis/templates/risk_business.html
Unescape View File

@ -57,7 +57,7 @@
name="order_type"
ng-model="params.orderType"
id="order-type-input"
ng-options="key as value for (key, value) in orderTypes">
ng-options="key as value.label for (key, value) in orderTypes">
<option value="">ALL</option>
</select>
</div>

Write Preview
Loading…
Cancel
Save