@@ -212,4 +213,4 @@
-
\ No newline at end of file
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_new_rate.html b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
index 6b6872b29..189a97ab1 100644
--- a/src/main/ui/static/payment/partner/templates/partner_new_rate.html
+++ b/src/main/ui/static/payment/partner/templates/partner_new_rate.html
@@ -160,6 +160,30 @@
+
+
@@ -214,4 +238,4 @@
\ No newline at end of file
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 630f9d6ab..71d3cadb5 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -31,7 +31,7 @@
Partial Refund |
Full Refund
+ ng-click="params.status='FULL_REFUNDED';loadTradeLogs(1)">Full Refund |
@@ -87,7 +87,9 @@
HFpay |
RPay +
+ ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay + |
+ Yeepay
@@ -188,6 +190,7 @@
+ 
{{trade.order_id}}
@@ -232,4 +235,4 @@
last-text="»">
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
-
\ No newline at end of file
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
index 804ab968b..581f53caa 100644
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@@ -56,6 +56,14 @@
+
@@ -209,6 +217,12 @@
+
@@ -354,6 +368,29 @@
+
+
+
+
@@ -429,18 +466,41 @@
Payment Page
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+ Sub Merchant Id
+ (当前使用){{id_apply.sub_merchant_id}}
+
+ -
+ Apply Time
+
+
+ -
+ Business Content
+ {{id_apply.business_content | yeepayBusinessContent}}
+
+ -
+ Business Category
+ {{id_apply.industry | yeepayIndustry}}
+
+ -
+ Operator
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/ui/static/payment/tradelog/templates/balance_report.html b/src/main/ui/static/payment/tradelog/templates/balance_report.html
index c6acfce95..91feaa526 100644
--- a/src/main/ui/static/payment/tradelog/templates/balance_report.html
+++ b/src/main/ui/static/payment/tradelog/templates/balance_report.html
@@ -97,7 +97,9 @@
HF Pay |
RPay +
+ ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay + |
+ Yeepay
@@ -298,6 +300,8 @@
uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+
{{trade.order_id2}}
|
|
@@ -371,4 +375,4 @@
-
\ No newline at end of file
+
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
index 30380e9a6..3640a2c4b 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
@@ -45,6 +45,11 @@
+
+
+ 
+
+
@@ -251,4 +256,4 @@
-
\ No newline at end of file
+
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index b69d79e45..c27eedccf 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -95,9 +95,11 @@
JD Pay |
HF Pay
+ ng-click="params.channel='HF';loadTradeLogs(1)">HF Pay |
RPay+
+ ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay+ |
+ Yeepay
@@ -325,6 +327,7 @@
+
{{trade.order_id}}
@@ -386,4 +389,4 @@
-
\ No newline at end of file
+
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index b4a3173f4..baa6712bd 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -135,7 +135,9 @@
HF Pay |
RPay +
+ ng-click="params.channel='RPAY';loadTradeLogs(1)">RPay + |
+ Yeepay
@@ -355,6 +357,8 @@
uib-tooltip="HF Pay" ng-if="trade.channel=='hf'"/>
+
{{trade.order_id}}
|
@@ -405,4 +409,4 @@
-
\ 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 6dbf6370d..8bfe25bf8 100644
--- a/src/main/ui/static/risk/risk.js
+++ b/src/main/ui/static/risk/risk.js
@@ -49,6 +49,10 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
url: '/risk/attention',
templateUrl: '/static/risk/templates/attention_merchants.html',
controller: 'AttentionMerchantCtrl'
+ }).state('analysis_monitoring.customer', {
+ url: '/risk/customer',
+ templateUrl: '/static/risk/templates/customer_blacklist.html',
+ controller: 'RiskCustomerBlackListCtrl'
});
}]);
app.controller('RiskManageCtrl', ['$scope', '$http', function ($scope, $http){
@@ -264,8 +268,22 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
$scope.loadAttentionMerchants(1);
})
};
+
+ $scope.editAttention = function (attention) {
+ $uibModal.open({
+ templateUrl: '/static/risk/templates/risk_merchant_edit.html',
+ controller: 'editRiskCtrl',
+ resolve:{
+ attention: attention
+ }
+ }).result.then(function () {
+ $scope.loadAttentionMerchants(1);
+ })
+ };
}]);
app.controller('newRiskCtrl', ['$scope', '$http','commonDialog', function ($scope, $http,commonDialog) {
+ $scope.attentions = {"enjoin_wechat": true,"enjoin_alipay": true,"enjoin_bestpay": true,
+ "enjoin_jd": true,"enjoin_hf": true}
$scope.save = function (attentions) {
var params = angular.copy(attentions);
$http.post('/sys/risk/attention/'+ attentions.client_moniker, params).then(function () {
@@ -276,6 +294,61 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS
});
};
}]);
+ app.controller('editRiskCtrl', ['$scope', '$http','commonDialog', 'attention', function ($scope, $http,commonDialog, attention) {
+ $scope.attentions = angular.copy(attention);
+ $scope.update = function (attentions) {
+ var params = angular.copy(attentions);
+ $http.put('/sys/risk/attention/'+ attentions.client_moniker + '/detail', params).then(function () {
+ commonDialog.alert({title: 'Success', content: 'add successfully', type: 'success'});
+ $scope.$close();
+ }, function (resp) {
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+ });
+ };
+ }]);
+ app.controller('RiskCustomerBlackListCtrl', ['$scope', '$http','commonDialog', '$uibModal', function ($scope, $http,commonDialog,$uibModal) {
+ $scope.params = {};
+ $scope.pagination = {};
+ $scope.loadCustomerBlackList = function (page) {
+ var params = angular.copy($scope.params);
+ params.page = page || $scope.pagination.page || 1;
+ $http.get('/sys/risk/customer/blacklist', {params : params}).then(function (resp) {
+ $scope.customerList = resp.data.data;
+ $scope.pagination = resp.data.pagination;
+ });
+ };
+ $scope.loadCustomerBlackList();
+ $scope.disableCustomer = function (openid) {
+ commonDialog.confirm({title: 'Confirm', content: '确定将该用户移除黑名单？'
+ }).then(function () {
+ $http.put('/sys/risk/customer/blacklist/' + openid).then(function () {
+ commonDialog.alert({title: 'Success', content: 'disable successfully', type: 'success'});
+ $scope.loadCustomerBlackList();
+ }, function (resp) {
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+ });
+ })
+ };
+ $scope.save = function () {
+ $uibModal.open({
+ templateUrl: '/static/risk/templates/new_customer_blacklist.html',
+ controller: 'newCustomerBlackListCtrl'
+ }).result.then(function () {
+ $scope.loadCustomerBlackList()
+ })
+ };
+ }]);
+ app.controller('newCustomerBlackListCtrl', ['$scope', '$http','commonDialog', function($scope, $http, commonDialog){
+ $scope.params = {};
+ $scope.addCustomer = function () {
+ $http.post('/sys/risk/customer/' + $scope.params.openid + '/blacklist', $scope.params).then(function () {
+ commonDialog.alert({title: 'Success', content: 'disable successfully', type: 'success'});
+ $scope.$close();
+ }, function (resp) {
+ commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
+ });
+ };
+ }]);
app.filter('risk_type', function () {
return function (riskStr) {
angular.forEach(riskType,function (type) {
diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html
index 88aeee434..6d98cbd24 100644
--- a/src/main/ui/static/risk/templates/attention_merchants.html
+++ b/src/main/ui/static/risk/templates/attention_merchants.html
@@ -56,6 +56,7 @@
| Contact Phone |
Operation Time |
Remark |
+ Disable Channels |
Operation |
@@ -69,9 +70,18 @@
{{client.contact_phone}} |
{{client.creation_date}} |
{{client.remark}} |
+
+ Wechat
+ Alipay
+ Bestpay
+ JD
+ HF
+ |
Disable
+ Edit
|
diff --git a/src/main/ui/static/risk/templates/customer_blacklist.html b/src/main/ui/static/risk/templates/customer_blacklist.html
new file mode 100644
index 000000000..7b9958987
--- /dev/null
+++ b/src/main/ui/static/risk/templates/customer_blacklist.html
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ | Openid |
+ Customer |
+ Operation Time |
+ Remark |
+ Operation |
+
+
+
+
+ | {{customer.openid}} |
+
+ ![]() {{customer.nickname}}
+ |
+ {{customer.creation_date}} |
+ {{customer.remark}} |
+
+ Disable
+ |
+
+
+
+
+
+
+