From f5e9503547615786cf60b2a5077731414e4a4e27 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Wed, 17 Oct 2018 11:32:20 +0800 Subject: [PATCH 1/4] [fix] --- .../manage/riskbusiness/bean/RiskEventQuery.java | 14 ++++++++++++++ .../core/impl/RiskBusinessServiceImpl.java | 2 +- .../analysis/templates/riskEvent_detail.html | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java index 255f873d9..d985cd22c 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/bean/RiskEventQuery.java @@ -41,6 +41,8 @@ public class RiskEventQuery { // 邮件回复截止日期 private String replyEmailDate; + private Integer page = 1; + public Integer getOrderType() { return orderType; } @@ -113,6 +115,14 @@ public class RiskEventQuery { this.replyEmailDate = replyEmailDate; } + public Integer getPage() { + return page; + } + + public void setPage(Integer page) { + this.page = page; + } + public JSONObject toJSON() { JSONObject params = new JSONObject(); @@ -154,6 +164,10 @@ public class RiskEventQuery { params.put("reply_email_date", replyEmailDate); } + if (page != null && page > 0) { + params.put("page", page); + } + return params; } } diff --git a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java index 64933b72d..2f10af19e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java @@ -87,7 +87,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService { @Override public JSONObject getRiskEventsByPage(JSONObject params) { - PageList riskEvents = riskEventMapper.listRisksByPage(params, new PageBounds(1, 10, Order.formString("create_time.desc"))); + PageList riskEvents = riskEventMapper.listRisksByPage(params, new PageBounds(params.getInteger("page"), 10, Order.formString("create_time.desc"))); return PageListUtils.buildPageListResult(riskEvents); } diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index cae8734e4..6d0514a4e 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -233,7 +233,7 @@ Send Email {{riskEvent.result_type == 1 ? 'again' : ''}} From 6c4288e3b6051938394d3e00f8f55c2691da0c77 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Wed, 17 Oct 2018 11:52:31 +0800 Subject: [PATCH 2/4] [fix] --- .../ui/static/analysis/templates/riskEvent_detail.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index 6d0514a4e..17a5b34b2 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -8,10 +8,10 @@
@@ -223,9 +223,9 @@ - - + - + From b3c20a18f16c7a5bc239d50cc79070a977b4b5e0 Mon Sep 17 00:00:00 2001 From: hellolujian <1370256381@qq.com> Date: Wed, 17 Oct 2018 12:00:03 +0800 Subject: [PATCH 3/4] [fix] --- .../analysis/templates/riskEvent_detail.html | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/ui/static/analysis/templates/riskEvent_detail.html b/src/main/ui/static/analysis/templates/riskEvent_detail.html index 17a5b34b2..e890e7173 100644 --- a/src/main/ui/static/analysis/templates/riskEvent_detail.html +++ b/src/main/ui/static/analysis/templates/riskEvent_detail.html @@ -50,8 +50,9 @@
-

+

+ {{clientInfo.sub_merchant_id || riskEvent.sub_merchant_id}} +

@@ -258,6 +259,31 @@
RiskEvent Basic Information
+
+ +
+ + +
+

required field +

+
+
+
+
@@ -289,30 +315,6 @@
-
- -
- - -
-

required field -

-
-
-
-
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 4/4] =?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); }