From 2efd7a04a7d3f361aaacc40d5e6bffa2fbccb3b1 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Wed, 17 Oct 2018 12:15:53 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E6=9B=B4=E6=96=B0=E5=B7=B2=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskbusiness/web/RiskBusinessController.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java index a43459b3f..f893da222 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java @@ -4,6 +4,7 @@ import au.com.royalpay.payment.manage.merchants.core.ClientManager; import au.com.royalpay.payment.manage.permission.manager.ManagerMapping; import au.com.royalpay.payment.manage.riskbusiness.bean.RiskEventQuery; import au.com.royalpay.payment.manage.riskbusiness.core.RiskBusinessService; +import au.com.royalpay.payment.manage.riskbusiness.enums.RiskResultTypeEnum; import au.com.royalpay.payment.tools.CommonConsts; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import com.alibaba.fastjson.JSONObject; @@ -99,6 +100,9 @@ public class RiskBusinessController { @PathVariable("channel") String channel, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { clientManager.switchChannelPermission(manager, params.getString("client_moniker"), channel, channelFlag); + + if (channelFlag) + params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType()); riskBusinessService.updateRiskEvent(params); } @@ -107,10 +111,17 @@ public class RiskBusinessController { @PathVariable("isValid") Boolean isValid, @ModelAttribute(CommonConsts.MANAGER_STATUS) JSONObject manager) { String clientMoniker = params.getString("client_moniker"); - if (isValid) + if (isValid) { clientManager.disableClient(clientMoniker, manager); - else + Integer temporaryCloseMerchant = params.getInteger("temporary_close_merchant"); + if (temporaryCloseMerchant != 1) { + params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType()); + } + } + else { clientManager.revertClient(clientMoniker, manager); + params.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType()); + } riskBusinessService.updateRiskEvent(params); }