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 1dd99cf10..3dc5eb074 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 @@ -30,7 +30,7 @@ public interface RiskMerchantService { JSONObject listAttentionMerchants(JSONObject manager, QueryAttentionMerchants queryAttention); - void addAttentionMerchant(JSONObject manager, String clientMoniker); + void addAttentionMerchant(JSONObject manager, String clientMoniker, JSONObject params); void disableAttentionMerchant(JSONObject manager, String clientMoniker); } 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 09188ab9f..4b6dd5e6d 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 @@ -224,7 +224,7 @@ public class RiskMerchantServiceImpl implements RiskMerchantService { } @Override - public void addAttentionMerchant(JSONObject manager, String clientMoniker) { + public void addAttentionMerchant(JSONObject manager, String clientMoniker, JSONObject params) { if (manager == null) { throw new BadRequestException("登录状态已过期，请清新登录再试"); } @@ -243,8 +243,9 @@ public class RiskMerchantServiceImpl implements RiskMerchantService { attention.put("contact_phone", client.getString("contact_phone")); attention.put("bank_account_no", bankAccount == null || bankAccount.size() <= 0 ? "" : bankAccount.get(0).getString("account_no")); attention.put("is_valid", 1); - attention.put("creation_date", new Date()); + attention.put("creation_date", params.getDate("creation_date")==null ? new Date() : params.getDate("creation_date")); attention.put("creation_by", manager.getString("manager_id")); + attention.put("remark", params.getString("remark")); attention.put("last_update_date", new Date()); attention.put("last_update_by", manager.getString("manager_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 ad01d7546..b1ffbff18 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 @@ -96,8 +96,8 @@ public class RiskController { } @RequestMapping(value = "/attention/{clientMoniker}", method = RequestMethod.POST) - public void addMerchant(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String clientMoniker) { - riskMerchantService.addAttentionMerchant(manager, clientMoniker); + public void addMerchant(@ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager, @PathVariable String clientMoniker, @RequestBody JSONObject params) { + riskMerchantService.addAttentionMerchant(manager, clientMoniker, params); } @RequestMapping(value = "/attention/{clientMoniker}", method = RequestMethod.PUT) diff --git a/src/main/ui/static/risk/risk.js b/src/main/ui/static/risk/risk.js index 5384f4641..22b7dc984 100644 --- a/src/main/ui/static/risk/risk.js +++ b/src/main/ui/static/risk/risk.js @@ -233,7 +233,7 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS $http.get('/sys/risk/attention', {params: params}).then(function (resp) { $scope.attentions = resp.data.data; $scope.pagination = resp.data.pagination; - $scope.ctrl.addAttention = false; + // $scope.ctrl.addAttention = false; }); }; $scope.loadAttentionMerchants(1); @@ -255,7 +255,26 @@ define(['angular', 'static/commons/commons', 'uiBootstrap', 'uiRouter', 'ngBootS }, function (resp) { commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); }); - } + }; + $scope.addAttention = function () { + $uibModal.open({ + templateUrl: '/static/risk/templates/risk_add.html', + controller: 'newRiskCtrl' + }).result.then(function () { + $scope.loadAttentionMerchants(1); + }) + }; + }]); + app.controller('newRiskCtrl', ['$scope', '$http','commonDialog', function ($scope, $http,commonDialog) { + $scope.save = function (attentions) { + var params = angular.copy(attentions); + $http.post('/sys/risk/attention/'+ attentions.client_moniker, 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.filter('risk_type', function () { return function (riskStr) { diff --git a/src/main/ui/static/risk/templates/attention_merchants.html b/src/main/ui/static/risk/templates/attention_merchants.html index 3a89d9773..b618f4f6b 100644 --- a/src/main/ui/static/risk/templates/attention_merchants.html +++ b/src/main/ui/static/risk/templates/attention_merchants.html @@ -23,8 +23,8 @@
- -
+ +
@@ -55,6 +55,7 @@ Contact Person Contact Phone Operation Time + Remark Operation @@ -67,6 +68,7 @@ {{client.contact_person}} {{client.contact_phone}} {{client.last_update_date}} + {{client.remark}} Disable diff --git a/src/main/ui/static/risk/templates/risk_add.html b/src/main/ui/static/risk/templates/risk_add.html new file mode 100644 index 000000000..31d9b768e --- /dev/null +++ b/src/main/ui/static/risk/templates/risk_add.html @@ -0,0 +1,41 @@ +
+

New Risk Merchants

+
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+
+ +
+
\ No newline at end of file