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

Merge remote-tracking branch 'origin/develop_risk' into develop_risk

Browse Source
master
james.zhao 6 years ago
parent f61cd5be0b f99a5a6ff5
commit dd11125c0f
10 changed files with 658 additions and 308 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.java
Unescape View File

@ -26,7 +26,6 @@ public interface RiskEventMapper {
@AutoSql(type = SqlType.SELECT) @AutoSql(type = SqlType.SELECT)
List<JSONObject> findAll(JSONObject params); List<JSONObject> findAll(JSONObject params);
@AutoSql(type = SqlType.SELECT)
PageList<JSONObject> listRisksByPage(JSONObject params, PageBounds pageBounds); PageList<JSONObject> listRisksByPage(JSONObject params, PageBounds pageBounds);
@AutoSql(type = SqlType.SELECT) @AutoSql(type = SqlType.SELECT)

14
src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/RiskBusinessService.java
Unescape View File

@ -3,6 +3,7 @@ package au.com.royalpay.payment.manage.riskbusiness.core;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import javax.servlet.http.HttpServletResponse;
import java.util.List; import java.util.List;
/** /**
@ -32,6 +33,13 @@ public interface RiskBusinessService {
*/ */
JSONObject getRiskEventDetail(String riskId); JSONObject getRiskEventDetail(String riskId);
/**
* 获取风险事件的调单信息
* @param orderIds
* @return
*/
List<JSONObject> getRiskEventOrderList(String orderIds);
/** /**
* 新增风险事件 * 新增风险事件
* @param params * @param params
@ -43,4 +51,10 @@ public interface RiskBusinessService {
* @param params * @param params
*/ */
void updateRiskEvent(JSONObject params); void updateRiskEvent(JSONObject params);
/**
* 下载审核材料（zip）
* @param riskId
*/
void downloadAuditMaterialZiP(String riskId, HttpServletResponse response);
} }

77
src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
Unescape View File

@ -1,16 +1,28 @@
package au.com.royalpay.payment.manage.riskbusiness.core.impl; package au.com.royalpay.payment.manage.riskbusiness.core.impl;
import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
import au.com.royalpay.payment.manage.mappers.payment.OrderMapper;
import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper; import au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper;
import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService; import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService;
import au.com.royalpay.payment.tools.utils.PageListUtils; import au.com.royalpay.payment.tools.utils.PageListUtils;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.github.miemiedev.mybatis.paginator.domain.Order; import com.github.miemiedev.mybatis.paginator.domain.Order;
import com.github.miemiedev.mybatis.paginator.domain.PageBounds; import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
import com.github.miemiedev.mybatis.paginator.domain.PageList; import com.github.miemiedev.mybatis.paginator.domain.PageList;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
/** /**
* @Author lvjian * @Author lvjian
@ -22,6 +34,12 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
@Autowired @Autowired
private RiskEventMapper riskEventMapper; private RiskEventMapper riskEventMapper;
@Autowired
private OrderMapper orderMapper;
@Autowired
private ClientMapper clientMapper;
@Override @Override
public List<JSONObject> getRiskEvents(JSONObject params) { public List<JSONObject> getRiskEvents(JSONObject params) {
return riskEventMapper.findAll(params); return riskEventMapper.findAll(params);
@ -36,7 +54,35 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
@Override @Override
public JSONObject getRiskEventDetail(String riskId) { public JSONObject getRiskEventDetail(String riskId) {
return riskEventMapper.findById(riskId); JSONObject riskEventDetail = riskEventMapper.findById(riskId);
// 获取商户信息
String clientMoniker = riskEventDetail.getString("client_moniker");
JSONObject client = clientMapper.findClientByMonikerAll(clientMoniker);
if (client == null) {
throw new InvalidShortIdException();
} else {
riskEventDetail.put("clientInfo", client);
}
return riskEventDetail;
}
@Override
public List<JSONObject> getRiskEventOrderList(String orderIds) {
String[] orderIdArray = orderIds.trim().split(",");
JSONObject query = new JSONObject();
List<JSONObject> tradeLogs = new ArrayList<>();
// 获取每笔订单的信息
for (int i = 0; i < orderIdArray.length; i++) {
query.put("order_id", orderIdArray[i]);
PageList<JSONObject> logs = orderMapper.listOrders(query, new PageBounds());
if (logs != null && logs.size() != 0) {
tradeLogs.add(logs.get(0));
}
}
return tradeLogs;
} }
@Override @Override
@ -48,4 +94,33 @@ public class RiskBusinessServiceImpl implements RiskBusinessService {
public void updateRiskEvent(JSONObject params) { public void updateRiskEvent(JSONObject params) {
riskEventMapper.update(params); riskEventMapper.update(params);
} }
@Override
public void downloadAuditMaterialZiP(String riskId, HttpServletResponse response) {
JSONObject riskEvent = riskEventMapper.findById(riskId);
String clientMoniker = riskEvent.getString("client_moniker");
try {
String downloadFilename = clientMoniker + "_audit_materials_" + DateFormatUtils.format(new Date(), "dd/MM/yyyy HH:mm:ss").toString() + ".zip";// 文件的名称
response.setContentType("application/octet-stream");
response.setHeader("Content-Disposition", "attachment;filename=" + downloadFilename);
ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
String filePath = "https://file.royalpay.com.au/open/2018/09/20/1537438083143_tqIYPEDYPr40Y9Cyj4Ps1xgSRrDrVb.jpg";
zos.putNextEntry(new ZipEntry(filePath.substring(filePath.lastIndexOf("/"))));
InputStream inputStream = new URL(filePath).openConnection().getInputStream();
byte[] buffer = new byte[1024];
int result = 0;
while ((result = inputStream.read(buffer)) != -1) {
zos.write(buffer, 0, result);
}
inputStream.close();
zos.flush();
zos.close();
zos.flush();
zos.close();
} catch (IOException e) {
e.printStackTrace();
}
}
} }

18
src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
Unescape View File

@ -9,10 +9,7 @@ import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.text.DateFormat; import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -34,8 +31,12 @@ public class RiskBusinessController {
} }
@GetMapping(value = "events/{risk_id}") @GetMapping(value = "events/{risk_id}")
public JSONObject getRiskEventDetail(@PathVariable("risk_id") String riskId) { public JSONObject getRiskEventDetail(@PathVariable("risk_id") String riskId,
return riskBusinessService.getRiskEventDetail(riskId); @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) {
JSONObject riskEvent = riskBusinessService.getRiskEventDetail(riskId);
List<JSONObject> tradeLogs = riskBusinessService.getRiskEventOrderList(riskEvent.getString("order_ids"));
riskEvent.put("tradeLogs", tradeLogs);
return riskEvent;
} }
@PostMapping(value = "events") @PostMapping(value = "events")
@ -49,5 +50,10 @@ public class RiskBusinessController {
public void UpdateRiskEvent(@RequestBody JSONObject params) { public void UpdateRiskEvent(@RequestBody JSONObject params) {
riskBusinessService.updateRiskEvent(params); riskBusinessService.updateRiskEvent(params);
} }
@GetMapping(value = "/{risk_id}/download/materialsAsZIP")
public void downloadComplianceZip(@PathVariable("risk_id") String riskId, HttpServletResponse response) throws Exception {
riskBusinessService.downloadAuditMaterialZiP(riskId, response);
}
} }

19
src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml
Unescape View File

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="au.com.royalpay.payment.manage.mappers.riskbusiness.RiskEventMapper">
<select id="listRisksByPage" resultType="com.alibaba.fastjson.JSONObject">
SELECT *
from risk_event
<where>
<if test="client_moniker != null">
AND client_moniker = #{client_moniker}
</if>
<if test="order_type != null">
AND order_type = #{order_type}
</if>
<if test="order_ids != null">
AND order_ids LIKE CONCAT('%', #{order_ids}, '%')
</if>
</where>
</select>
</mapper>

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

@ -4,13 +4,28 @@
define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'], define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
function (angular, $) { function (angular, $) {
'use strict'; 'use strict';
var orderTypes = { var orderTypesMap = {
"1": "微信调单", "1": "微信调单",
"2": "支付宝调单", "2": "支付宝调单",
"3": "RoyalPay调单", "3": "RoyalPay调单",
"4": "警告", "4": "警告",
"5": "通用号调单" "5": "通用号调单"
}; };
var resultTypesMap = {
"0": "未处理",
"1": "已发送邮件至BD",
"2": "BD已提交材料，等待审核",
"3": "材料审核通过",
"4": "材料审核不通过，已打回",
"5": "已处理（）",
};
var emailStatusMap = {
"0": "未发送",
"1": "已发送"
};
var app = angular.module('riskBusinessApp', ['ui.router']); var app = angular.module('riskBusinessApp', ['ui.router']);
app.config(['$stateProvider', function ($stateProvider) { app.config(['$stateProvider', function ($stateProvider) {
$stateProvider.state('analysis_monitoring.risk_business', { $stateProvider.state('analysis_monitoring.risk_business', {
@ -31,13 +46,17 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
url: '/new_riskEvent', url: '/new_riskEvent',
templateUrl: '/static/analysis/templates/new_riskEvent.html', templateUrl: '/static/analysis/templates/new_riskEvent.html',
controller: 'newRiskEventCtrl' controller: 'newRiskEventCtrl'
}).state('analysis_monitoring.riskEvent_detail.audit_material', {
url: '/audit_material',
templateUrl: '/static/analysis/templates/audit_material.html',
controller: 'auditMaterialCtrl'
}); });
}]); }]);
app.controller('riskBusinessCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog', app.controller('riskBusinessCtrl', ['$scope', '$state', '$http', '$uibModal', 'commonDialog',
function ($scope, $state, $http, $uibModal, commonDialog) { function ($scope, $state, $http, $uibModal, commonDialog) {
$scope.orderTypes = orderTypes; $scope.orderTypes = orderTypesMap;
$scope.pagination = {}; $scope.pagination = {};
$scope.params = {}; $scope.params = {};
@ -51,18 +70,36 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
}; };
$scope.loadRiskEvents(1); $scope.loadRiskEvents(1);
} }
]); ]);
app.controller('riskEventDetailCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', 'riskEvent', app.controller('riskEventDetailCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', 'riskEvent',
function ($scope, $state, $http, $uibModal, $filter, commonDialog, riskEvent) { function ($scope, $state, $http, $uibModal, $filter, commonDialog, riskEvent) {
$scope.orderTypes = orderTypesMap;
$scope.riskEvent = riskEvent.data; $scope.riskEvent = riskEvent.data;
// 编辑表格的数据保存对象，重新从源数据复制，从而取消保存操作时不会更新视图
$scope.riskEventEdit = angular.copy(riskEvent.data);
// order_type转换为string类型是因为前端select控件这样才会显示初值
$scope.riskEventEdit.order_type += "";
// 调单信息
$scope.tradeLogs = $scope.riskEvent.tradeLogs;
// 商户信息
$scope.clientInfo = $scope.riskEvent.clientInfo;
// 控制编辑表格的显示
$scope.editFlag = false; $scope.editFlag = false;
$scope.changeEditFlag = function(editFlag) { $scope.changeEditFlag = function(editFlag) {
$scope.editFlag = !editFlag; $scope.editFlag = !editFlag;
// 如果是在编辑状态，需要将日期转换为date类型（前端控件需要）
// 如果是在非编辑状态，需要将日期转换为yyyy-MM-dd格式
if ($scope.editFlag) { if ($scope.editFlag) {
$scope.riskEvent.reply_email_date = new Date($scope.riskEvent.reply_email_date.replace(/-/g, "/")); $scope.riskEventEdit.reply_email_date = new Date($scope.riskEventEdit.reply_email_date.replace(/-/g, "/"));
} else { } else {
$scope.riskEvent.reply_email_date = $filter('date')($scope.riskEvent.reply_email_date, 'yyyy-MM-dd'); $scope.riskEvent.reply_email_date = $filter('date')($scope.riskEvent.reply_email_date, 'yyyy-MM-dd');
} }
@ -78,8 +115,9 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
return; return;
} }
$scope.riskEvent.reply_email_date = $filter('date')($scope.riskEvent.reply_email_date, 'yyyy-MM-dd'); // 保存时需要重新将日期转换为yyyy-MM-dd格式传入后端
$http.put('/risk/business/events', $scope.riskEvent).then(function (resp) { $scope.riskEventEdit.reply_email_date = $filter('date')($scope.riskEventEdit.reply_email_date, 'yyyy-MM-dd');
$http.put('/risk/business/events', $scope.riskEventEdit).then(function (resp) {
commonDialog.alert({ commonDialog.alert({
title: 'Success', title: 'Success',
content: 'Update riskEvent successfully', content: 'Update riskEvent successfully',
@ -93,13 +131,64 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
type: 'error' type: 'error'
}); });
}); });
};
// 关停渠道
$scope.updateChannel = function (orderType) {
var channel;
if (orderType == "1")
channel = 'wechat';
else if (orderType == "2")
channel = 'alipay';
$http.put('/sys/partners/' + $scope.riskEvent.client_moniker + '/channels/' + channel + '/permission', {allow: $scope.clientInfo['enable_' + channel]}).then(function () {
$state.reload('analysis_monitoring.riskEvent_detail');
}, function (resp) {
commonDialog.alert({
title: 'Failed to change ' + channel + ' channel permission status',
content: resp.data.message,
type: 'error'
})
});
};
// 关停商户
$scope.updateClient = function(isValid) {
if (isValid) {
$http.put('/sys/partners/' + $scope.riskEvent.client_moniker + '/revert').then(function () {
$state.reload('analysis_monitoring.riskEvent_detail');
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
} else {
$http.delete('/sys/partners/' + $scope.riskEvent.client_moniker).then(function () {
$state.reload('analysis_monitoring.riskEvent_detail');
}, function (resp) {
commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
})
}
};
// 获取riskEvent详细信息
$scope.loadRiskEventDetail = function(riskId) {
$http.get('/risk/business/events/' + riskId)
} }
} }
]); ]);
app.controller('auditMaterialCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog',
function ($scope, $state, $http, $uibModal, $filter, commonDialog) {
$scope.downloadAsZip = function () {
var url = '/risk/business/' + $scope.riskEvent.risk_id + '/download/materialsAsZIP';
return url;
};
}
]);
app.controller('newRiskEventCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog', app.controller('newRiskEventCtrl', ['$scope', '$state', '$http', '$uibModal', '$filter', 'commonDialog',
function ($scope, $state, $http, $uibModal, $filter, commonDialog) { function ($scope, $state, $http, $uibModal, $filter, commonDialog) {
$scope.orderTypes = orderTypes;
$scope.orderTypes = orderTypesMap;
$scope.save = function(form) { $scope.save = function(form) {
if (form.$invalid) { if (form.$invalid) {
@ -111,6 +200,7 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
return; return;
} }
// 默认设置邮件回复截止日期为七天后
var replyDeadline = new Date(); var replyDeadline = new Date();
replyDeadline.setDate(replyDeadline.getDate() + 7); replyDeadline.setDate(replyDeadline.getDate() + 7);
$scope.riskEvent.reply_email_date = $filter('date')(replyDeadline, 'yyyy-MM-dd'); $scope.riskEvent.reply_email_date = $filter('date')(replyDeadline, 'yyyy-MM-dd');
@ -133,5 +223,26 @@ define(['angular', 'jquery', 'uiRouter', './monitoring/analysis-monitoring'],
} }
]); ]);
// 调单类型过滤器
app.filter('orderType', function() {
return function(type) {
return orderTypesMap[type];
}
});
// 处理结果过滤器
app.filter('resultType', function() {
return function(type) {
return resultTypesMap[type];
}
});
// 邮件发送状态过滤器
app.filter('emailStatus', function() {
return function(status) {
return emailStatusMap[status];
}
});
return app; return app;
}); });

35
src/main/ui/static/analysis/templates/audit_material.html
Unescape View File

@ -0,0 +1,35 @@
<div class="panel panel-default">
<div class="panel-heading">Audit Files &nbsp;&nbsp;&nbsp;
<!--后面需要加上ng-if="file"-->
<a class="btn-group btn btn-success" ng-href="{{downloadAsZip()}}" target="_blank">
<i class="fa fa-cloud-download">一键下载</i>
</a>
</div>
<div class="panel-body">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2">* bank statement</label>
<div class="col-sm-4">
<div class="form-control-static">
<uib-progressbar value="bankFileProgress.value" ng-if="bankFileProgress"></uib-progressbar>
<a ng-if="bankIsImage" target="_blank" ng-href="{{file.client_bank_file}}">
<img ng-src="{{file.client_bank_file}}" class="col-sm-8"></a>
</div>
<div class="col-sm-6">
<div class="form-control-static">
<p>Example：请保证图片信息清晰可见,如下图</p>
<img class="col-sm-6" style="border: 1px solid #ddd"
src="https://file.royalpay.com.au/open/2017/03/07/1488859920633_5ruVtDa30yY2ytBSDAAqxg0Ob2nreh.jpeg">
</div>
</div>
</div>
</div>
</div>
<div style="text-align: center">
<a role="button" style="margin-bottom: 25px;" class="btn btn-success btn-sm ng-scope" ng-if="('10'|withRole)" ng-click="complianceCheck()">check</a>
</div>
</div>
<!--<div class="margin-bottom margin-top">-->
<!--<button class="btn-group btn btn-success" type="button" ng-click="updateFile()">Save-->
<!--</button>-->
<!--</div>-->

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

@ -12,23 +12,30 @@
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group" <div class="form-group"
ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}"> 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</label> <label class="control-label col-sm-2"
for="short-id-input">* Partner Code
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control text-uppercase" <input class="form-control"
ng-model="riskEvent.client_moniker" ng-model="riskEvent.client_moniker"
type="text" type="text"
name="client_moniker" name="client_moniker"
id="short-id-input" required maxlength="6" id="short-id-input"
required
maxlength="6"
ng-pattern="/^[a-zA-Z0-9]+$/"> ng-pattern="/^[a-zA-Z0-9]+$/">
<div ng-messages="riskEventForm.client_moniker.$error" <div ng-messages="riskEventForm.client_moniker.$error"
ng-if="riskEventForm.client_moniker.$dirty"> ng-if="riskEventForm.client_moniker.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger"
Field</p> ng-message="required">Required Field
<p class="small text-danger" ng-message="maxlength">Less </p>
Than 6 Letters</p> <p class="small text-danger"
<p class="small text-danger" ng-message="pattern">Only ng-message="maxlength">Less Than 6 Letters
Uppercase Letters and </p>
Numbers are allowed</p> <p class="small text-danger"
ng-message="pattern">
Only Uppercase Letters and Numbers are allowed
</p>
</div> </div>
</div> </div>
</div> </div>
@ -36,18 +43,21 @@
<div class="form-group" <div class="form-group"
ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}"> ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
<label class="control-label col-sm-2" <label class="control-label col-sm-2"
for="order-type-input">Order Type</label> for="order-type-input">Order Type
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="order_type" <select class="form-control"
name="order_type"
ng-model="riskEvent.order_type" ng-model="riskEvent.order_type"
id="order-type-input" required id="order-type-input"
required
ng-options="key as value for (key, value) in orderTypes"> ng-options="key as value for (key, value) in orderTypes">
<option value="">Please Choose</option> <option value="">Please Choose</option>
</select> </select>
<div ng-messages="riskEventForm.order_type.$error" <div ng-messages="riskEventForm.order_type.$error"
ng-if="riskEventForm.order_type.$dirty"> ng-if="riskEventForm.order_type.$dirty">
<p class="small text-danger" ng-message="required"> <p class="small text-danger"
required field ng-message="required">required field
</p> </p>
</div> </div>
</div> </div>
@ -55,40 +65,46 @@
<div class="form-group" <div class="form-group"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}"> ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
<label class="control-label col-sm-2" for="order-ids-input">Order IDs</label> <label class="control-label col-sm-2"
for="order-ids-input">Order IDs</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="riskEvent.order_ids" type="text" <input class="form-control"
ng-model="riskEvent.order_ids"
type="text"
name="order_ids" name="order_ids"
id="order-ids-input" id="order-ids-input"
required> required>
<div ng-messages="riskEventForm.order_ids.$error" <div ng-messages="riskEventForm.order_ids.$error"
ng-if="riskEventForm.order_ids.$dirty"> ng-if="riskEventForm.order_ids.$dirty">
<p class="small text-danger" ng-message="required"> <p class="small text-danger"
required field ng-message="required">required field
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="description-input">Description</label> <label class="control-label col-sm-2"
for="description-input">Description
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="riskEvent.description" type="text" <input class="form-control"
ng-model="riskEvent.description"
type="text"
name="description" name="description"
id="description-input"> id="description-input">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="btn-group margin-bottom margin-top"> <div class="btn-group margin-bottom margin-top">
<button class="btn btn-success" type="button" ng-click="save(riskEventForm)">Save <button class="btn btn-success"
type="button"
ng-click="save(riskEventForm)">Save
</button> </button>
</div> </div>
</form> </form>

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

@ -1,8 +1,20 @@
<div ui-view> <div class="content">
<!--
<section class="content-header"> <section class="content-header">
<h1>Risk Event</h1> <h1>Risk Event</h1>
</section> </section>-->
<div class="content"> <div class="row">
<div class="col-sm-12">
<div class="nav-tabs-custom">
<ul class="nav nav-tabs">
<li ui-sref-active-eq="active">
<a ui-sref="analysis_monitoring.riskEvent_detail">Risk Detail</a>
</li>
<li ui-sref-active="active">
<a ui-sref=".audit_material">Audit material</a>
</li>
</ul>
<div class="tab-content" ui-view>
<div class="row" ng-if="!editFlag"> <div class="row" ng-if="!editFlag">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="nav-tabs-custom"> <div class="nav-tabs-custom">
@ -10,36 +22,55 @@
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
RiskEvent Basic Information RiskEvent Basic Information
<a role="button" class="pull-right" <a role="button"
class="pull-right"
ng-click="changeEditFlag(editFlag)"> ng-click="changeEditFlag(editFlag)">
<i class="fa fa-edit"></i> Edit <i class="fa fa-edit"></i> Edit
</a> </a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Partner Code</label> <label class="control-label col-sm-2">Partner Code</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="riskEvent.client_moniker"></p> <p class="form-control-static"
ng-bind="riskEvent.client_moniker"></p>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-sm-2">Order IDs</label>
<div class="col-sm-10">
<p class="form-control-static"
ng-bind="riskEvent.order_ids">
</p>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Order Type</label> <label class="control-label col-sm-2">Order Type</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="riskEvent.order_type"></p> <p class="form-control-static"
ng-bind="riskEvent.order_type | orderType">
</p>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Result Type</label> <label class="control-label col-sm-2">Result Type</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="riskEvent.result_type"></p> <p class="form-control-static">
{{riskEvent.result_type | resultType}}
</p>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Email Status</label> <label class="control-label col-sm-2">Email Status</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="riskEvent.email_status"></p> <p class="form-control-static"
ng-bind="riskEvent.email_status | emailStatus"></p>
</div> </div>
</div> </div>
@ -55,13 +86,35 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Description</label> <label class="control-label col-sm-2">Description</label>
<div class="col-sm-10"> <div class="col-sm-10">
<p class="form-control-static" ng-bind="riskEvent.description"></p> <p class="form-control-static"
ng-bind="riskEvent.description">
</p>
</div> </div>
</div> </div>
<div class="form-group">
<label class="control-label col-sm-2">临时关闭渠道</label>
<div class="col-xs-6">
<input type="checkbox"
ng-if="riskEvent.order_type == '1'"
ng-model="clientInfo.enable_wechat"
bs-switch ng-change="updateChannel(riskEvent.order_type)">
<input type="checkbox"
ng-if="riskEvent.order_type == '2'"
ng-model="clientInfo.enable_alipay"
bs-switch ng-change="updateChannel(riskEvent.order_type)">
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">临时关闭商户</label>
<div class="col-xs-6">
<input type="checkbox" ng-model="clientInfo.is_valid" bs-switch ng-change="updateClient(clientInfo.is_valid)">
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
<!-- 调单信息 --> <!-- 调单信息 -->
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
@ -69,6 +122,7 @@
Orders Information Orders Information
</h3> </h3>
</div> </div>
<div class="box-body table-responsive"> <div class="box-body table-responsive">
<table class="table table-bordered table-hover table-striped"> <table class="table table-bordered table-hover table-striped">
<thead> <thead>
@ -84,32 +138,32 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="trade in tradeLogs" ng-class="{warning:trade.clearing_status==2}"> <tr ng-repeat="trade in tradeLogs"
ng-class="{warning:trade.clearing_status==2}">
<td>{{trade.order_id}}</td> <td>{{trade.order_id}}</td>
<td>{{trade.total_amount|currency:trade.currency}}</td> <td>{{trade.total_amount | currency: trade.currency}}</td>
<td ng-bind="trade.display_amount|currency:trade.currency"></td> <td ng-bind="trade.display_amount | currency: trade.currency"></td>
<td ng-bind="trade.clearing_amount|currency:'AUD'"></td> <td ng-bind="trade.clearing_amount | currency: 'AUD'"></td>
<td> <td>
<span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')" ng-bind="trade.exchange_rate"></span> <span ng-if="(trade.channel != 'hf') && (trade.channel != 'Rpay')"
ng-bind="trade.exchange_rate">
</span>
<span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span> <span ng-if="(trade.channel == 'hf') || (trade.channel == 'Rpay')"> - </span>
</td> </td>
<td ng-bind="trade.status|tradeStatus"></td> <td ng-bind="trade.status | tradeStatus"></td>
<td ng-bind="trade.create_time"></td> <td ng-bind="trade.create_time"></td>
<td ng-bind="trade.gateway|tradeGateway"></td> <td ng-bind="trade.gateway | tradeGateway"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
<a role="button" class="btn btn-info"> <a role="button"
Send Email class="btn btn-info">Send Email
</a> </a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -122,23 +176,30 @@
<div class="form-horizontal"> <div class="form-horizontal">
<div class="form-group" <div class="form-group"
ng-class="{'has-error':riskEventForm.client_moniker.$invalid && riskEventForm.client_moniker.$dirty}"> 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</label> <label class="control-label col-sm-2"
for="short-id-input">* Partner Code
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control text-uppercase" <input class="form-control text-uppercase"
ng-model="riskEvent.client_moniker" ng-model="riskEventEdit.client_moniker"
type="text" type="text"
name="client_moniker" name="client_moniker"
id="short-id-input" required maxlength="6" id="short-id-input"
required
maxlength="6"
ng-pattern="/^[a-zA-Z0-9]+$/"> ng-pattern="/^[a-zA-Z0-9]+$/">
<div ng-messages="riskEventForm.client_moniker.$error" <div ng-messages="riskEventForm.client_moniker.$error"
ng-if="riskEventForm.client_moniker.$dirty"> ng-if="riskEventForm.client_moniker.$dirty">
<p class="small text-danger" ng-message="required">Required <p class="small text-danger"
Field</p> ng-message="required">Required Field
<p class="small text-danger" ng-message="maxlength">Less </p>
Than 6 Letters</p> <p class="small text-danger"
<p class="small text-danger" ng-message="pattern">Only ng-message="maxlength">Less Than 6 Letters
Uppercase Letters and </p>
Numbers are allowed</p> <p class="small text-danger"
ng-message="pattern">
Only Uppercase Letters and Numbers are allowed
</p>
</div> </div>
</div> </div>
</div> </div>
@ -146,18 +207,22 @@
<div class="form-group" <div class="form-group"
ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}"> ng-class="{'has-error':riskEventForm.order_type.$invalid && riskEventForm.order_type.$dirty}">
<label class="control-label col-sm-2" <label class="control-label col-sm-2"
for="order-type-input">Order Type</label> for="order-type-input">Order Type
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select class="form-control" name="order_type" <select class="form-control"
ng-model="riskEvent.order_type" name="order_type"
id="order-type-input" required 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 for (key, value) in orderTypes">
<option value="">Please Choose</option> <option value="">Please Choose</option>
</select> </select>
<div ng-messages="riskEventForm.order_type.$error" <div ng-messages="riskEventForm.order_type.$error"
ng-if="riskEventForm.order_type.$dirty"> ng-if="riskEventForm.order_type.$dirty">
<p class="small text-danger" ng-message="required"> <p class="small text-danger"
required field ng-message="required">required field
</p> </p>
</div> </div>
</div> </div>
@ -165,29 +230,38 @@
<div class="form-group" <div class="form-group"
ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}"> ng-class="{'has-error':riskEventForm.order_ids.$invalid && riskEventForm.order_ids.$dirty}">
<label class="control-label col-sm-2" for="order-ids-input">Order IDs</label> <label class="control-label col-sm-2"
for="order-ids-input">Order IDs
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="riskEvent.order_ids" type="text" <input class="form-control"
ng-model="riskEventEdit.order_ids"
type="text"
name="order_ids" name="order_ids"
id="order-ids-input" id="order-ids-input"
required> required>
<div ng-messages="riskEventForm.order_ids.$error" <div ng-messages="riskEventForm.order_ids.$error"
ng-if="riskEventForm.order_ids.$dirty"> ng-if="riskEventForm.order_ids.$dirty">
<p class="small text-danger" ng-message="required"> <p class="small text-danger"
required field ng-message="required">required field
</p> </p>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="reply-deadline-input">Reply Deadline</label> <label class="control-label col-sm-2"
for="reply-deadline-input">Reply Deadline
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div style="display: inline-block"> <div style="display: inline-block">
<input class="form-control" id="reply-deadline-input" <input class="form-control"
id="reply-deadline-input"
type="text" type="text"
ng-model="riskEvent.reply_email_date" ng-model="riskEventEdit.reply_email_date"
uib-datepicker-popup size="10" placeholder="Reply Deadline" uib-datepicker-popup
size="10"
placeholder="Reply Deadline"
is-open="replyDeadline.open" is-open="replyDeadline.open"
ng-click="replyDeadline.open=true" ng-click="replyDeadline.open=true"
datepicker-options="{minDate:today}"> datepicker-options="{minDate:today}">
@ -196,35 +270,37 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2" for="description-input">Description</label> <label class="control-label col-sm-2"
for="description-input">Description
</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" ng-model="riskEvent.description" type="text" <input class="form-control"
ng-model="riskEventEdit.description"
type="text"
name="description" name="description"
id="description-input"> id="description-input">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="btn-group margin-bottom margin-top"> <div class="btn-group margin-bottom margin-top">
<button class="btn btn-success" <button class="btn btn-success"
style="margin-right: 10px;" style="margin-right: 10px;"
type="button" type="button"
ng-click="save(riskEventForm)"> ng-click="save(riskEventForm)">Save
Save
</button> </button>
<button class="btn btn-warning" <button class="btn btn-warning"
type="button" type="button"
ng-click="changeEditFlag(editFlag)"> ng-click="changeEditFlag(editFlag)">cancel
cancel
</button> </button>
</div> </div>
</form> </form>
</div> </div>
</div>
</div>
</div>
</div> </div>

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

@ -6,17 +6,22 @@
<div class="box-header"> <div class="box-header">
<div class="form-inline"> <div class="form-inline">
<div class="form-group"> <div class="form-group">
<label class="control-label" for="partner-code-search">Partner Code</label> <label class="control-label"
<input type="text" class="form-control" id="partner-code-search" for="partner-code-search">Partner Code
ng-model="params.client_moniker"> </label>
<input type="text"
class="form-control"
id="partner-code-search"
ng-model="params.clientMoniker">
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label" for="order-type-input"> <label class="control-label"
Order Type for="order-type-input">Order Type
</label> </label>
<select class="form-control" name="order_type" <select class="form-control"
ng-model="params.order_type" name="order_type"
ng-model="params.orderType"
id="order-type-input" id="order-type-input"
ng-options="key as value for (key, value) in orderTypes"> ng-options="key as value for (key, value) in orderTypes">
<option value="">ALL</option> <option value="">ALL</option>
@ -24,28 +29,34 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<button class="btn btn-primary" type="button" ng-click="loadRiskEvents(1)"><i <label class="control-label"
class="fa fa-search"></i></button> for="order-ids-input">Order IDs
</div> </label>
<input class="form-control"
<div class="form-group"> ng-model="params.orderIds"
<label class="control-label col-sm-2" for="order-ids-input">Order IDs</label> type="text"
<div class="col-sm-8">
<input class="form-control" ng-model="params.order_ids" type="text"
name="order_ids" name="order_ids"
id="order-ids-input"> id="order-ids-input">
</div> </div>
<div class="form-group">
<button class="btn btn-primary"
type="button"
ng-click="loadRiskEvents(1)">
<i class="fa fa-search"></i>
</button>
</div> </div>
<a role="button" class="btn btn-info pull-right" <a role="button"
ui-sref=".new_riskEvent" title="New Event"> class="btn btn-info pull-right"
<i class="fa fa-plus"></i> ui-sref=".new_riskEvent"
New Event title="New Event">
<i class="fa fa-plus"></i>New Event
</a> </a>
</div> </div>
</div> </div>
</div> </div>
<div class="box"> <div class="box">
<div class="box-header"> <div class="box-header">
<h3 class="box-title">RiskEvent List</h3> <h3 class="box-title">RiskEvent List</h3>
@ -55,7 +66,6 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>Partner Code</th> <th>Partner Code</th>
<th>Order Type</th> <th>Order Type</th>
<th>Result Type</th> <th>Result Type</th>
@ -70,28 +80,17 @@
<tbody> <tbody>
<tr ng-repeat="riskEvent in riskEvents"> <tr ng-repeat="riskEvent in riskEvents">
<td ng-bind="riskEvent.client_moniker"></td> <td ng-bind="riskEvent.client_moniker"></td>
<td> <td ng-bind="riskEvent.order_type | orderType"></td>
<span ng-if="riskEvent.order_type == 1">微信调单</span> <td ng-bind="riskEvent.result_type | resultType"></td>
<span ng-if="riskEvent.order_type == 2">支付宝调单</span>
<span ng-if="riskEvent.order_type == 3">RoyalPay调单</span>
<span ng-if="riskEvent.order_type == 4">警告</span>
<span ng-if="riskEvent.order_type == 5">通用号调单</span>
</td>
<td>
<span ng-if="riskEvent.result_type == 0">未处理</span>
<span ng-if="riskEvent.result_type == 1">处理中</span>
<span ng-if="riskEvent.result_type == 2">已处理</span>
</td>
<td ng-bind="riskEvent.sub_merchant_id"></td> <td ng-bind="riskEvent.sub_merchant_id"></td>
<td> <td ng-bind="riskEvent.email_status | emailStatus"></td>
<span ng-if="riskEvent.email_status == 0">未发送</span>
<span ng-if="riskEvent.email_status == 1">已发送</span>
</td>
<td ng-bind="riskEvent.fillin_person"></td> <td ng-bind="riskEvent.fillin_person"></td>
<td ng-bind="riskEvent.description | limitTo:20"></td> <td ng-bind="riskEvent.description | limitTo:20"></td>
<td ng-bind="riskEvent.create_time"></td> <td ng-bind="riskEvent.create_time"></td>
<td> <td>
<a class="text-primary" role="button" title="Detail" <a class="text-primary"
role="button"
title="Detail"
ui-sref="analysis_monitoring.riskEvent_detail({risk_id:riskEvent.risk_id})"> ui-sref="analysis_monitoring.riskEvent_detail({risk_id:riskEvent.risk_id})">
<i class="fa fa-search"></i> Detail <i class="fa fa-search"></i> Detail
</a> </a>
@ -99,9 +98,10 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="box-footer" ng-if="riskEvents.length">
<div class="box-footer"
ng-if="riskEvents.length">
<uib-pagination class="pagination" <uib-pagination class="pagination"
total-items="pagination.totalCount" total-items="pagination.totalCount"
boundary-links="true" boundary-links="true"
@ -112,17 +112,16 @@
previous-text="&lsaquo;" previous-text="&lsaquo;"
next-text="&rsaquo;" next-text="&rsaquo;"
first-text="&laquo;" first-text="&laquo;"
last-text="&raquo;"></uib-pagination> last-text="&raquo;">
</uib-pagination>
<div class="row"> <div class="row">
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div> <div class="col-xs-12">
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
Write Preview
Loading…
Cancel
Save