From 490618f3b949a1fa95e190605d998f1425ab4334 Mon Sep 17 00:00:00 2001 From: "james.zhao" Date: Wed, 21 Nov 2018 19:25:24 +0800 Subject: [PATCH] Update --- .../core/impl/RiskBusinessServiceImpl.java | 25 +++++++++++++------ .../web/RiskBusinessController.java | 5 ++++ .../templates/mail/risk_upload_mail.html | 10 +++++--- .../templates/mail/risk_urge_mail.html | 4 +-- 4 files changed, 30 insertions(+), 14 deletions(-) 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 60e01399e..56792f71c 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 @@ -336,13 +336,13 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo event.put("result_type", RiskResultTypeEnum.ALREADY_HANDLED.getResultType()); } riskEventMapper.update(event); + if(event.getIntValue("is_send_client") == 1){ + sendAppRiskMessage(event); + } } catch (Exception e) { throw new EmailException("Email Sending Failed", e); } }); - if(event.getIntValue("order_type")==3){ - sendAppRiskMessage(event); - } } private void sendAppRiskMessage(JSONObject event){ @@ -501,16 +501,21 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo ctx.setVariable("royalpay_order_type", event.getIntValue("royalpay_order_type")); ctx.setVariable("warning_order_type", event.getIntValue("warning_order_type")); ctx.setVariable("description", event.getString("description")); - //String[] orderIds = event.getString("order_ids").split(","); - String[] realOrderIds = event.getString("real_order_ids").split(","); + ctx.setVariable("is_send_client",event.getIntValue("is_send_client")); + String realOrderIdsStr = event.getString("real_order_ids"); + String[] realOrderIds = {}; + if (StringUtils.isNotBlank(realOrderIdsStr)) { + realOrderIds = event.getString("real_order_ids").split(","); + } List orders = new ArrayList(); + int isSendClient = event.getIntValue("is_send_client"); switch (event.getIntValue("order_type")){ case 1: case 2: for(String orderId : realOrderIds){ JSONObject order = orderMapper.findOrderById(orderId,client.getIntValue("client_id")); if(order==null){ - throw new BadRequestException("Order: "+orderId+" not exists"); + throw new BadRequestException("Order: " + orderId + " not exists"); } orders.add(order); } @@ -543,8 +548,12 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo // ctx.setVariable("files",attachList); case 4: ctx.setVariable("title","RoyalPay风控调查 — " + client.getString("short_name")); - ctx.setVariable("emailsCcs", bdEmails); - ctx.setVariable("emailsTos", clientEmails); + ctx.setVariable("emailsTos", bdEmails); + if (isSendClient == 1) { + ctx.setVariable("emailsTos", clientEmails); + ctx.setVariable("emailsCcs", bdEmails); + } + break; } return ctx; 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 94f684bb0..2629b5a9a 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 @@ -95,6 +95,11 @@ public class RiskBusinessController { return riskBusinessService.getRiskMaterial(param); } + @GetMapping(value = "/{risk_id}/all_material_info") + public JSONObject getRiskAlMaterialInfo(@PathVariable("risk_id") String riskId) { + return riskBusinessService.getRiskEventMaterialsRemark(riskId); + } + @PutMapping(value = "/channel/{channel}/permission/{channelFlag}") public void updateMerchantChannel(@RequestBody JSONObject params, @PathVariable("channelFlag") Boolean channelFlag, diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html index 2decbc81b..ce7150e06 100644 --- a/src/main/resources/templates/mail/risk_upload_mail.html +++ b/src/main/resources/templates/mail/risk_upload_mail.html @@ -1,8 +1,8 @@
- Dear : + Dear :

- ， + ， ,您提交的风控材料已被拒绝。 拒绝理由：。 @@ -42,7 +42,8 @@

2、

如果提交的材料不齐， 则有关停支付的风险。感谢，辛苦。

-

Submit Risk Materials

+

Submit Risk Materials

+

材料请通过APP在规定时间内进行上传，或请联系BD，由BD在后台进行上传。

尊敬的RoyalPay商户 :
@@ -111,7 +112,8 @@ -

Submit Risk Materials

+

Submit Risk Materials

+

材料请通过APP在规定时间内进行上传，或请联系BD，由BD在后台进行上传。

尊敬的RoyalPay商户 :
diff --git a/src/main/resources/templates/mail/risk_urge_mail.html b/src/main/resources/templates/mail/risk_urge_mail.html index 00d0b1fab..af9561d35 100644 --- a/src/main/resources/templates/mail/risk_urge_mail.html +++ b/src/main/resources/templates/mail/risk_urge_mail.html @@ -1,7 +1,7 @@ Dear RoyalPay Merchant/BD : -

您好,您的风控材料链接即将过期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。

-

Your link to the risk materials is about to expire, please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.

+

您好，您的风控材料— 【】提交期限即将于到期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。

+

Your deadline for submission of risk materials for 【】 is about to expire by , please submit the risk materials in time.If you can not provide qualified materials on time, the payment channels would be suspended or restricted with amount limit. Please be sure to assist the investigation. Thanks.

Best Regards