msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update

Browse Source
master
james.zhao 6 years ago
parent d2a6c37489
commit 490618f3b9
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File

25
src/main/java/au/com/royalpay/payment/manage/riskbusiness/core/impl/RiskBusinessServiceImpl.java
Unescape View File

@ -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<JSONObject> 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;

5
src/main/java/au/com/royalpay/payment/manage/riskbusiness/web/RiskBusinessController.java
Unescape View File

@ -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,

10
src/main/resources/templates/mail/risk_upload_mail.html
Unescape View File

@ -1,8 +1,8 @@
<html xmlns:th="http://www.thymeleaf.org" lang="zh">
<div th:if="${order_type==1||order_type==2}">
<b>Dear <span th:text="${bdNamesStr}"></span> :</b>
<b>Dear <span th:text="${bdNamesStr}" th:if="${is_send_client==0}"></span><span th:text="${client.contact_person}" th:if="${is_send_client==1}"></span>:</b>
<p>
<span th:text="${hello}"></span>，<span th:text="${bdNamesStr}"></span>
<span th:text="${hello}"></span>，<span th:text="${bdNamesStr}" th:if="${is_send_client==0}"></span><span th:text="${client.contact_person}" th:if="${is_send_client==1}"></span>
<span th:if="${refuse}">,您提交的风控材料已被拒绝</span>。
<span th:if="${refuse_description != null}">
拒绝理由：<span th:text="${refuse_description}" style="background-color: yellow"></span>。
@ -42,7 +42,8 @@
<p th:if="${description != null}">2、<span th:text="${description}"></span></p>
<p>如果提交的材料不齐， 则有关停支付的风险。<!--还请按时提供商户材料并直接回复该邮件， -->感谢，辛苦。</p>
<!--<p>请点击此链接上传所需材料<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a></p>-->
<p><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>
<p th:if="${is_send_client==0}"><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>
<p th:if="${is_send_client==1}">材料请通过APP在规定时间内进行上传，或请联系BD，由BD在后台进行上传。</p>
</div>
<div th:if="${order_type==3}">
<b>尊敬的RoyalPay商户 :<br>
@ -111,7 +112,8 @@
<!--<p>请点击此链接上传所需材料。<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a><br>-->
<!--Please click on this link to upload the required materials.<a th:href="${uploadUrl}"><span th:text="${uploadUrl}"></span></a>-->
<!--</p>-->
<p><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>
<p th:if="${is_send_client==0}"><a th:href="${uploadUrl}" style="color: rgb(255, 255, 255); text-align: center; padding: 12px 10px; height: 100%; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px; text-decoration: none; background-color: #00c0ef; min-width: 150px;"><strong>Submit Risk Materials</strong></a></p>
<p th:if="${is_send_client==1}">材料请通过APP在规定时间内进行上传，或请联系BD，由BD在后台进行上传。</p>
</div>
<div th:if="${order_type==4}">
<b>尊敬的RoyalPay商户 :<br>

4
src/main/resources/templates/mail/risk_urge_mail.html
Unescape View File

@ -1,7 +1,7 @@
<html xmlns:th="http://www.thymeleaf.org" lang="zh">
<b>Dear RoyalPay Merchant/BD :</b>
<p>您好,您的风控材料链接即将过期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。</p>
<p>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.</p>
<p>您好，您的风控材料—<span th:text="${client.company_name}"></span> 【<span th:text="${client.client_moniker}"></span>】提交期限即将于<span style="background: #FCE824" th:text="${reply_date}"></span>到期，请及时提交风控材料。未能按时提交完整证明材料，支付渠道将被关停，请您务必配合调查。感谢。</p>
<p>Your deadline for submission of risk materials for <span th:text="${client.company_name}"></span>【<span th:text="${client.client_moniker}"></span>】 is about to expire by <span th:text="${reply_date_english}" style="background: #FCE824"></span>, 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.</p>
<h4>Best Regards</h4>
<p>
<img style="width: 120px;height: 120px"

Write Preview
Loading…
Cancel
Save