From 33db182dfbb8f20a35b7c772d6fd5f832ee6d410 Mon Sep 17 00:00:00 2001 From: wangning <164851225@qq.com> Date: Sat, 28 Apr 2018 09:06:45 +0800 Subject: [PATCH] tmp --- .../risk/RiskMerchantRecordMapper.java | 6 +- .../risk/RiskTransactionLogMapper.java | 3 + .../manage/risk/bean/QueryRIskRecord.java | 41 ---- .../manage/risk/bean/QueryRiskOrder.java | 69 +++++++ .../manage/risk/bean/QueryRiskRecord.java | 83 ++++++++ .../manage/risk/core/RiskMerchantService.java | 11 +- .../core/impl/RiskMerchantServiceImpl.java | 56 ++++-- .../manage/risk/web/RiskController.java | 19 +- .../mappers/risk/RiskMerchantRecordMapper.xml | 6 + .../mappers/risk/RiskTransactionLogMapper.xml | 19 ++ src/main/ui/static/risk/risk.js | 181 +++++++++++++----- src/main/ui/static/risk/templates/risk.html | 25 ++- .../ui/static/risk/templates/risk_deit.html | 170 ---------------- .../ui/static/risk/templates/risk_detail.html | 35 ---- .../ui/static/risk/templates/risk_edit.html | 31 +++ .../static/risk/templates/risk_history.html | 115 +++++++++++ .../ui/static/risk/templates/risk_orders.html | 96 ++++++++++ 17 files changed, 632 insertions(+), 334 deletions(-) delete mode 100644 src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRIskRecord.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskOrder.java create mode 100644 src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskRecord.java create mode 100644 src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.xml delete mode 100644 src/main/ui/static/risk/templates/risk_deit.html delete mode 100644 src/main/ui/static/risk/templates/risk_detail.html create mode 100644 src/main/ui/static/risk/templates/risk_edit.html create mode 100644 src/main/ui/static/risk/templates/risk_history.html create mode 100644 src/main/ui/static/risk/templates/risk_orders.html diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java index 998a95695..1c14b9b0a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.java @@ -1,10 +1,10 @@ package au.com.royalpay.payment.manage.mappers.risk; -import java.util.List; - import org.apache.ibatis.annotations.Param; import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; import cn.yixblog.support.mybatis.autosql.annotations.AutoMapper; import cn.yixblog.support.mybatis.autosql.annotations.AutoSql; @@ -18,7 +18,7 @@ public interface RiskMerchantRecordMapper { @AutoSql(type = SqlType.UPDATE) void update(JSONObject record); - List query(JSONObject params); + PageList query(JSONObject params, PageBounds pagination); @AutoSql(type = SqlType.SELECT) JSONObject findById(@Param("id") String id); diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java index 17f2aa4d2..c3b4cbc41 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.java @@ -1,6 +1,8 @@ package au.com.royalpay.payment.manage.mappers.risk; import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import com.github.miemiedev.mybatis.paginator.domain.PageList; import org.apache.ibatis.annotations.Param; @@ -21,4 +23,5 @@ public interface RiskTransactionLogMapper { @AutoSql(type = SqlType.SELECT) List findByRecordId(@Param("record_id") String record_id); + PageList query(JSONObject params, PageBounds pagination); } diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRIskRecord.java b/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRIskRecord.java deleted file mode 100644 index 2ec955f23..000000000 --- a/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRIskRecord.java +++ /dev/null @@ -1,41 +0,0 @@ -package au.com.royalpay.payment.manage.risk.bean; - -import com.alibaba.fastjson.JSONObject; - -public class QueryRIskRecord { - - private String status; - private String client_moniker; - private String record_id; - - public JSONObject toParams(){ - JSONObject params = new JSONObject(); - params.put("status",this.status); - params.put("client_moniker",this.client_moniker); - params.put("record_id",this.record_id); - return params; - } - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getRecord_id() { - return record_id; - } - - public void setRecord_id(String record_id) { - this.record_id = record_id; - } - - public String getClient_moniker() { - return client_moniker; - } - - public void setClient_moniker(String client_moniker) { - this.client_moniker = client_moniker; - } -} diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskOrder.java b/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskOrder.java new file mode 100644 index 000000000..96a9ecfab --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskOrder.java @@ -0,0 +1,69 @@ +package au.com.royalpay.payment.manage.risk.bean; + +import com.alibaba.fastjson.JSONObject; + +import org.apache.commons.lang3.time.DateUtils; + +import java.text.ParseException; + +public class QueryRiskOrder { + + private String record_id; + private String c_end_time; + private int client_id; + private int limit = 20; + private int page; + + public JSONObject toParams() { + JSONObject params = new JSONObject(); + params.put("record_id", this.record_id); + params.put("client_id", this.client_id); + try { + if (c_end_time != null) { + params.put("c_end_time", DateUtils.parseDate(this.c_end_time, new String[] { "yyyy-MM-dd HH:mm:ss" })); + } + } catch (ParseException e) { + } + return params; + } + + public String getRecord_id() { + return record_id; + } + + public void setRecord_id(String record_id) { + this.record_id = record_id; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public String getC_end_time() { + return c_end_time; + } + + public void setC_end_time(String c_end_time) { + this.c_end_time = c_end_time; + } + + public int getClient_id() { + return client_id; + } + + public void setClient_id(int client_id) { + this.client_id = client_id; + } +} \ No newline at end of file diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskRecord.java b/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskRecord.java new file mode 100644 index 000000000..a1de31509 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/risk/bean/QueryRiskRecord.java @@ -0,0 +1,83 @@ +package au.com.royalpay.payment.manage.risk.bean; + +import com.alibaba.fastjson.JSONObject; + +import org.apache.commons.lang3.time.DateUtils; + +import java.text.ParseException; + +public class QueryRiskRecord { + + private String status; + private String client_moniker; + private String record_id; + private String c_end_time; + private int client_id; + + private int limit = 20; + private int page; + + public JSONObject toParams() { + JSONObject params = new JSONObject(); + params.put("status", this.status); + params.put("client_moniker", this.client_moniker); + params.put("record_id", this.record_id); + params.put("client_id", this.client_id); + try { + if (c_end_time != null) { + params.put("c_end_time", DateUtils.parseDate(this.c_end_time, new String[] { "yyyy-MM-dd HH:mm:ss" })); + } + } catch (ParseException e) { + } + return params; + + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getRecord_id() { + return record_id; + } + + public void setRecord_id(String record_id) { + this.record_id = record_id; + } + + public String getClient_moniker() { + return client_moniker; + } + + public void setClient_moniker(String client_moniker) { + this.client_moniker = client_moniker; + } + + public int getLimit() { + return limit; + } + + public void setLimit(int limit) { + this.limit = limit; + } + + public int getPage() { + return page; + } + + public void setPage(int page) { + this.page = page; + } + + public String getC_end_time() { + return c_end_time; + } + + public void setC_end_time(String c_end_time) { + this.c_end_time = c_end_time; + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java b/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java index d6af1b689..415dca96b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java +++ b/src/main/java/au/com/royalpay/payment/manage/risk/core/RiskMerchantService.java @@ -2,12 +2,11 @@ package au.com.royalpay.payment.manage.risk.core; import au.com.royalpay.payment.manage.risk.bean.AddRiskDetailLog; import au.com.royalpay.payment.manage.risk.bean.DealRiskRecord; -import au.com.royalpay.payment.manage.risk.bean.QueryRIskRecord; +import au.com.royalpay.payment.manage.risk.bean.QueryRiskOrder; +import au.com.royalpay.payment.manage.risk.bean.QueryRiskRecord; import com.alibaba.fastjson.JSONObject; -import java.util.List; - public interface RiskMerchantService { void addDetailLog(AddRiskDetailLog addRiskDetailLog, JSONObject account); @@ -18,14 +17,16 @@ public interface RiskMerchantService { void dealRiskRecord(JSONObject account,DealRiskRecord dealRiskRecord); - List getRiskOrders(String recordId); + JSONObject getRiskOrders(QueryRiskOrder queryRiskOrder); - List getRiskRecords(QueryRIskRecord queryRIskRecord); + JSONObject getRiskRecords(QueryRiskRecord queryRiskRecord); void addWhiteList(String client_moinker); void disableWhiteList(String client_moinker); + JSONObject getRecordById(String record_id); + } diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java index 631562e43..0c541847b 100644 --- a/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/risk/core/impl/RiskMerchantServiceImpl.java @@ -7,18 +7,21 @@ import au.com.royalpay.payment.manage.mappers.risk.RiskWhiteListMapper; import au.com.royalpay.payment.manage.merchants.core.ClientManager; import au.com.royalpay.payment.manage.risk.bean.AddRiskDetailLog; import au.com.royalpay.payment.manage.risk.bean.DealRiskRecord; -import au.com.royalpay.payment.manage.risk.bean.QueryRIskRecord; +import au.com.royalpay.payment.manage.risk.bean.QueryRiskOrder; +import au.com.royalpay.payment.manage.risk.bean.QueryRiskRecord; import au.com.royalpay.payment.manage.risk.core.RiskMerchantService; import au.com.royalpay.payment.tools.exceptions.BadRequestException; import au.com.royalpay.payment.tools.exceptions.NotFoundException; +import au.com.royalpay.payment.tools.utils.PageListUtils; import com.alibaba.fastjson.JSONObject; +import com.github.miemiedev.mybatis.paginator.domain.PageBounds; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Date; -import java.util.List; import javax.annotation.Resource; @@ -39,8 +42,8 @@ public class RiskMerchantServiceImpl implements RiskMerchantService { @Override public void addDetailLog(AddRiskDetailLog addRiskDetailLog, JSONObject account) { JSONObject record = addRiskDetailLog.params(); - record.put("auditor",account.getString("display_name")); - record.put("create_time",new Date()); + record.put("auditor", account.getString("display_name")); + record.put("create_time", new Date()); riskMerchantDetalLogMapper.save(record); } @@ -79,7 +82,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService { } JSONObject record = new JSONObject(); record.put("id", recordId); - record.put("status", "1"); + record.put("status", "2"); riskMerchantRecordMapper.update(record); JSONObject detail = new JSONObject(); detail.put("record_id", recordId); @@ -91,28 +94,48 @@ public class RiskMerchantServiceImpl implements RiskMerchantService { } @Override - public void dealRiskRecord(JSONObject account,DealRiskRecord dealRiskRecord) { + @Transactional + public void dealRiskRecord(JSONObject account, DealRiskRecord dealRiskRecord) { JSONObject record = riskMerchantRecordMapper.findById(dealRiskRecord.getRecordId()); - if(record==null){ + if (record == null) { throw new NotFoundException("Risk Record Not Found Please Check"); } - if(dealRiskRecord.getLimitAmount()!=null){ - clientManager.setMaxOrderAmount(record.getString("client_moniker"),dealRiskRecord.getLimitAmount()); + if (record.getIntValue("status") != 0) { + throw new BadRequestException("The Record Has Been Handled"); + } + String operation = ""; + if (dealRiskRecord.getLimitAmount() != null) { + clientManager.setMaxOrderAmount(record.getString("client_moniker"), dealRiskRecord.getLimitAmount()); + operation = operation + "限额" + dealRiskRecord.getLimitAmount(); + } - if(dealRiskRecord.getDisableMerchat()){ + if (dealRiskRecord.getDisableMerchat()) { clientManager.switchChannelPermission(account, record.getString("client_moniker"), "Wechat", false); clientManager.switchChannelPermission(account, record.getString("client_moniker"), "Alipay", false); + operation = operation + " 关闭支付通道"; } + JSONObject detail = new JSONObject(); + detail.put("record_id", dealRiskRecord.getRecordId()); + detail.put("client_id", record.getIntValue("client_id")); + detail.put("auditor", account.getString("display_name")); + detail.put("operation", StringUtils.isEmpty(operation) ? null : (operation = "处理结果:" + operation)); + detail.put("create_time", new Date()); + riskMerchantDetalLogMapper.save(detail); + record.put("status", 1); + riskMerchantRecordMapper.update(record); } @Override - public List getRiskOrders(String recordId) { - return riskTransactionLogMapper.findByRecordId(recordId); + public JSONObject getRiskOrders(QueryRiskOrder queryRiskOrder) { + return PageListUtils.buildPageListResult( + riskTransactionLogMapper.query(queryRiskOrder.toParams(), new PageBounds(queryRiskOrder.getPage(), queryRiskOrder.getLimit()))); + } @Override - public List getRiskRecords(QueryRIskRecord queryRIskRecord) { - return riskMerchantRecordMapper.query(queryRIskRecord.toParams()); + public JSONObject getRiskRecords(QueryRiskRecord queryRiskRecord) { + return PageListUtils.buildPageListResult( + riskMerchantRecordMapper.query(queryRiskRecord.toParams(), new PageBounds(queryRiskRecord.getPage(), queryRiskRecord.getLimit()))); } @Override @@ -143,4 +166,9 @@ public class RiskMerchantServiceImpl implements RiskMerchantService { white.put("is_valid", false); riskWhiteListMapper.update(white); } + + @Override + public JSONObject getRecordById(String record_id) { + return riskMerchantRecordMapper.findById(record_id); + } } diff --git a/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java b/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java index 016dc1fc7..b857c3090 100644 --- a/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java +++ b/src/main/java/au/com/royalpay/payment/manage/risk/web/RiskController.java @@ -3,7 +3,8 @@ package au.com.royalpay.payment.manage.risk.web; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.manage.risk.bean.AddRiskDetailLog; import au.com.royalpay.payment.manage.risk.bean.DealRiskRecord; -import au.com.royalpay.payment.manage.risk.bean.QueryRIskRecord; +import au.com.royalpay.payment.manage.risk.bean.QueryRiskOrder; +import au.com.royalpay.payment.manage.risk.bean.QueryRiskRecord; import au.com.royalpay.payment.manage.risk.core.RiskMerchantService; import au.com.royalpay.payment.tools.CommonConsts; @@ -16,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - import javax.annotation.Resource; /** @@ -31,10 +30,15 @@ public class RiskController { private RiskMerchantService riskMerchantService; @RequestMapping(value = "/records", method = RequestMethod.GET) - public List list(QueryRIskRecord recordQuery) { + public JSONObject list(QueryRiskRecord recordQuery) { return riskMerchantService.getRiskRecords(recordQuery); } + @RequestMapping(value = "/records/{record_id}", method = RequestMethod.GET) + public JSONObject getById(@PathVariable String record_id) { + return riskMerchantService.getRecordById(record_id); + } + @RequestMapping(value = "/records/{record_id}/dropOrder", method = RequestMethod.PUT) public void dropOrder(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String record_id) { riskMerchantService.DropOrderRiskRecord(manager, record_id); @@ -51,11 +55,12 @@ public class RiskController { riskMerchantService.dealRiskRecord(manager,dealRiskRecord); } - @RequestMapping(value = "/orders/{record_id}", method = RequestMethod.GET) - public List getRiskOrders(@PathVariable String record_id) { - return riskMerchantService.getRiskOrders(record_id); + @RequestMapping(value = "/orders", method = RequestMethod.GET) + public JSONObject getRiskOrders(QueryRiskOrder queryRiskOrder) { + return riskMerchantService.getRiskOrders(queryRiskOrder); } + @RequestMapping(value = "/white/{client_moniker}", method = RequestMethod.POST) public void addWhiteList(@PathVariable String client_moniker) { riskMerchantService.addWhiteList(client_moniker); diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.xml index bd4fd0f27..67dceb727 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskMerchantRecordMapper.xml @@ -14,6 +14,12 @@ and client_moniker = #{client_moniker} + + and create_time < #{c_end_time} + + + and client_id = #{client_id} + \ No newline at end of file diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.xml new file mode 100644 index 000000000..d7f0bf1eb --- /dev/null +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/risk/RiskTransactionLogMapper.xml @@ -0,0 +1,19 @@ + + + + + \ No newline at end of file diff --git a/src/main/ui/static/risk/risk.js b/src/main/ui/static/risk/risk.js index c81b3d92c..961565a57 100644 --- a/src/main/ui/static/risk/risk.js +++ b/src/main/ui/static/risk/risk.js @@ -1,84 +1,159 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], function (angular) { 'use strict'; + + var riskType = [ + {code: 1, label: 'test1'}, + {code: 2, label: 'test2'}, + ]; + var app = angular.module('RiskManagement', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload']); app.config(['$stateProvider', function ($stateProvider) { $stateProvider.state('analysis_monitoring.risk_manager', { url: '/risk/manage', templateUrl: '/static/risk/templates/risk.html', controller: 'RiskManageCtrl', - }).state('analysis_monitoring.risk_detail', { - url: '/detail', - templateUrl: '/static/risk/templates/risk_detail.html', - controller: 'RiskDetailCtrl', - params : { - param:null + }).state('analysis_monitoring.risk_orders', { + url: '/risk/{record_id}/orders', + templateUrl: '/static/risk/templates/risk_orders.html', + controller: 'RiskOrderCtrl', + resolve:{ + record:['$http','$stateParams', function ($http,$stateParams) { + return $http.get('/sys/risk/records/'+$stateParams.record_id).then(function (res) { + return res.data; + }); + }] } - }).state('vipcustomers.detail', { - url: '/{vip_code}/detail', - templateUrl: '/static/payment/vipcustomer/templates/vipcustomer_detail.html', - controller: 'vipCustomerDetailCtrl', - }).state('vipcustomers.edit', { - url: '/{vip_code}/edit', - templateUrl: '/static/payment/vipcustomer/templates/vipcustomer_edit.html', - controller: 'vipCustomerEditCtrl', - resolve: { - vipcustomer: ['$http', '$stateParams', function ($http, $stateParams) { - return $http.get('/partner/vip/' + $stateParams.vip_code); + }).state('analysis_monitoring.risk_history', { + url: '/risk/{record_id}/history', + templateUrl: '/static/risk/templates/risk_history.html', + controller: 'RecordHistoryCtrl', + resolve:{ + record:['$http','$stateParams', function ($http,$stateParams) { + return $http.get('/sys/risk/records/'+$stateParams.record_id).then(function (res) { + return res.data; + }); }] } - }) + }); }]); - app.controller('RiskManageCtrl', ['$scope', '$http','$state', function ($scope, $http,$state){ + app.controller('RiskManageCtrl', ['$scope', '$http', function ($scope, $http){ $scope.params = {}; - $scope.loadRecords = function () { + $scope.pagination = {}; + $scope.loadRecords = function (page) { var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; $http.get('/sys/risk/records', {params: params}).then(function (resp) { - $scope.records = resp.data; + $scope.records = resp.data.data; + $scope.pagination = resp.data.pagination; }); }; $scope.loadRecords(1); - $scope.edit = function () { - $uibModal.open({ - templateUrl: '/static/payment/partner/templates/partner_new_rate.html', - controller: 'RiskRecordEditCtrl', - resolve: { - rate: function () { - return {rate_name: name, clean_days: 3}; - }, - sys_common_rate: function () { - return $http.get('/sys/partners/sys_rates'); - }, - clientMoniker: function () { - return $scope.partner.client_moniker; - } - } - }).result.then(function () { - $scope.getRates(); - }); - }; - $scope.jumpDetail = function (record_id,client_moniker) { - var param = {}; - param.client_moniker = client_moniker; - param.record_id = record_id; - $state.go('analysis_monitoring.risk_detail',{param:param}); - } }]); - app.controller('RiskDetailCtrl', ['$scope', '$http', '$stateParams','$uibModal', function ($scope, $http,$stateParams,$uibModal) { - $scope.client_moniker = $stateParams.param.client_moniker; - $scope.params = {}; - $scope.loadOrders = function () { - $http.get('/sys/risk/orders/' + $stateParams.param.record_id).then(function (resp) { - $scope.orders = resp.data; + app.controller('RiskOrderCtrl', ['$scope', '$http', 'record', function ($scope, $http,record) { + $scope.params = {record_id: record.id}; + $scope.historyParams = {client_id:record.client_id}; + $scope.pagination = {}; + $scope.historyPagination = {}; + $scope.record = record; + $scope.loadOrders = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/sys/risk/orders',{params: params}).then(function (resp) { + $scope.orders = resp.data.data; + $scope.pagination = resp.data.pagination; + $scope.historyParams.c_end_time = $scope.orders.pop().create_time; + $scope.loadHistoryOrders(1); }); }; $scope.loadOrders(1); + + $scope.loadHistoryOrders = function (page) { + var historyParams = angular.copy($scope.historyParams); + historyParams.page = page || $scope.historyPagination.page || 1; + $http.get('/sys/risk/orders',{params: historyParams}).then(function (resp) { + $scope.historyOrders = resp.data.data; + $scope.historyPagination = resp.data.pagination; + }); + }; + }]); + + app.controller('RecordHistoryCtrl', ['$scope', '$http','$uibModal', 'commonDialog','record', function ($scope, $http,$uibModal,commonDialog,record) { + $scope.record = record; + $scope.pagination = {}; + $scope.params = {client_id:record.client_id,c_end_time:record.create_time}; + $scope.listHistory = function (page) { + var params = angular.copy($scope.params); + params.page = page || $scope.pagination.page || 1; + $http.get('/sys/risk/records',{params:params}).then(function (res) { + $scope.histories = res.data.data; + $scope.pagination = res.data.pagination; + }) + }; + $scope.listHistory(1); + $scope.edit = function () { + $uibModal.open({ + templateUrl: '/static/risk/templates/risk_edit.html', + controller: 'RiskRecordHandleCtrl', + resolve:{record_id:function () { + return record.id; + }} + }).result.then(function () { + commonDialog.alert({ + title: 'Success', + type: 'success' + }); + }) + }; + + + $scope.noop = function () { + commonDialog.confirm({ + title: 'Confirm', + content: '确定放弃这次预警' + }).then(function () { + $http.put('/sys/risk/records/'+ record.id+'/noop', $scope.params).then(function () { + }).then(function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'Error' + }); + }) + }) + } }]); - app.controller('RiskRecordEditCtrl', ['$scope', '$http', function ($scope, $http) { + app.controller('RiskRecordHandleCtrl', ['$scope', '$http','record_id','commonDialog', function ($scope, $http,record_id,commonDialog) { + $scope.params= {}; + $scope.handle = function () { + $http.put('/sys/risk/records/'+ record_id+'/deal', $scope.params).then(function () { + $scope.$close(); + }).then(function (resp) { + commonDialog.alert({ + title: 'Error', + content: resp.data.message, + type: 'Error' + }); + }) + } }]); + app.filter('risk_type', function (typeString) { + var sArr = typeString.split(","); + var result = ""; + angular.forEach(sArr, function (s) { + angular.forEach(riskType,function (type) { + if (type==s){ + result+=type; + result+=","; + } + }) + }); + result = result.substr(0,result.length-2); + return result; + }); return app; }); \ No newline at end of file diff --git a/src/main/ui/static/risk/templates/risk.html b/src/main/ui/static/risk/templates/risk.html index f8cf7dfce..7253a7a99 100644 --- a/src/main/ui/static/risk/templates/risk.html +++ b/src/main/ui/static/risk/templates/risk.html @@ -15,8 +15,9 @@ Client Moniker Create Time - Expiry Time + Waring Time Risk Types + Status Risk Counts Operation @@ -26,19 +27,31 @@ {{record.client_moniker}} {{record.create_time}} {{record.expiry_time}} - {{record.risk_types}} + {{record.status}} + {{record.risk_types|risk_type}} {{record.risk_counts}} - + - - - +
+ +
diff --git a/src/main/ui/static/risk/templates/risk_deit.html b/src/main/ui/static/risk/templates/risk_deit.html deleted file mode 100644 index 1692b6e20..000000000 --- a/src/main/ui/static/risk/templates/risk_deit.html +++ /dev/null @@ -1,170 +0,0 @@ -
-

New Client Rate

-
-
-
-
-
-
-
- -
-
- -
{{rateConfig}}
-
-
-
-
- -
-
- -
%
-
-
-
- No more than 2.2% -
-
- No less than 0.6% -
-
- Required Field -
-
- -
-
-
- -
-
- -
%
-
-
-
- No more than 2.2% -
-
- No less than 0.6% -
-
- Required Field -
-
- -
-
-
- -
-
- -
%
-
-
-
- No more than 2.2% -
-
- No less than 0.6% -
-
- Required Field -
-
- -
-
-
- -
-
- -
%
-
-
-
- No more than 2.2% -
-
- No less than 0.6% -
-
- Required Field -
-
- -
-
- -
- -
-
- -
%
-
-
-
- No more than 2.2% -
-
- No less than 0.6% -
-
- Required Field -
-
- -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
-
- - -
\ No newline at end of file diff --git a/src/main/ui/static/risk/templates/risk_detail.html b/src/main/ui/static/risk/templates/risk_detail.html deleted file mode 100644 index 89b79572b..000000000 --- a/src/main/ui/static/risk/templates/risk_detail.html +++ /dev/null @@ -1,35 +0,0 @@ -
-
-

Risk Manager

-
    -
  1. Risk
    2. -
  2. Risk Manager
    3. -
  3. Risk records
    4. -
-
-
-
-
Records Orders(Partner Code:{{client_moniker}})
-
- - - - - - - - - - - - - - - - - -
Order IdAmountChannelRisk Types
{{order.order_id}}{{order.amount}}{{order.channel}}{{order.risk_types}}
-
-
-
-
\ No newline at end of file diff --git a/src/main/ui/static/risk/templates/risk_edit.html b/src/main/ui/static/risk/templates/risk_edit.html new file mode 100644 index 000000000..14e2ce8c2 --- /dev/null +++ b/src/main/ui/static/risk/templates/risk_edit.html @@ -0,0 +1,31 @@ +
+

Phone Top Up

+
+ +
+
+
+
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+
+
+
+
diff --git a/src/main/ui/static/risk/templates/risk_history.html b/src/main/ui/static/risk/templates/risk_history.html new file mode 100644 index 000000000..87a2f2468 --- /dev/null +++ b/src/main/ui/static/risk/templates/risk_history.html @@ -0,0 +1,115 @@ +
+
+

Risk Manager

+
    +
  1. Risk
    2. +
  2. Risk Manager
    3. +
  3. Risk records
    4. +
+
+
+ +
+
Record History
+
+ + + + + + + + + + + + + + + + + + + + + + + +
Client MonikerCreate TimeWaring TimeRisk TypesStatusRisk CountsOperation
{{record.client_moniker}}{{record.create_time}}{{record.expiry_time}}{{record.status}}{{record.risk_types|risk_type}}{{record.risk_counts}} + + + + + + + +
+
+ +
+
+
+ + +
+
Latest Record
+
+ + + + + + + + + + + + + + + + + + + + + +
Client MonikerCreate TimeWaring TimeRisk TypesStatusRisk Counts
{{record.client_moniker}}{{record.create_time}}{{record.expiry_time}}{{record.status}}{{record.risk_types|risk_type}}{{record.risk_counts}}
+
+ +
+
+
+ +
+
\ No newline at end of file diff --git a/src/main/ui/static/risk/templates/risk_orders.html b/src/main/ui/static/risk/templates/risk_orders.html new file mode 100644 index 000000000..e4399d1d2 --- /dev/null +++ b/src/main/ui/static/risk/templates/risk_orders.html @@ -0,0 +1,96 @@ +
+
+

Risk Manager

+
    +
  1. Risk
    2. +
  2. Risk Manager
    3. +
  3. Risk records
    4. +
+
+
+ +
+
Reference Orders
+
+ + + + + + + + + + + + + + + + + +
Order IdAmountChannelRisk Types
{{order.order_id}}{{order.amount}}{{order.channel}}{{order.risk_types|risk_type}}
+
+
+ +
+
+ +
+
Waring Orders History
+
+ + + + + + + + + + + + + + + + + +
Order IdAmountChannelRisk Types
{{order.order_id}}{{order.amount}}{{order.channel}}{{order.risk_types|risk_type}}
+
+
+ +
+
+ +
+
\ No newline at end of file