|
|
@ -32,6 +32,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.exceptions.WechatExce
|
|
|
|
import au.com.royalpay.payment.tools.device.message.AppMessage;
|
|
|
|
import au.com.royalpay.payment.tools.device.message.AppMessage;
|
|
|
|
import au.com.royalpay.payment.tools.device.message.AppMsgSender;
|
|
|
|
import au.com.royalpay.payment.tools.device.message.AppMsgSender;
|
|
|
|
import au.com.royalpay.payment.tools.env.PlatformEnvironment;
|
|
|
|
import au.com.royalpay.payment.tools.env.PlatformEnvironment;
|
|
|
|
|
|
|
|
import au.com.royalpay.payment.tools.env.SysConfigManager;
|
|
|
|
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
|
|
|
|
import au.com.royalpay.payment.tools.exceptions.BadRequestException;
|
|
|
|
import au.com.royalpay.payment.tools.exceptions.event.WechatExceptionEvent;
|
|
|
|
import au.com.royalpay.payment.tools.exceptions.event.WechatExceptionEvent;
|
|
|
|
import au.com.royalpay.payment.tools.locale.LocaleSupport;
|
|
|
|
import au.com.royalpay.payment.tools.locale.LocaleSupport;
|
|
|
@ -134,6 +135,9 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
|
|
|
|
private MpWechatApiProvider mpWechatApiProvider;
|
|
|
|
private MpWechatApiProvider mpWechatApiProvider;
|
|
|
|
private ApplicationEventPublisher publisher;
|
|
|
|
private ApplicationEventPublisher publisher;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private SysConfigManager sysConfigManager;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
public void setAppMsgSenders(AppMsgSender[] senders) {
|
|
|
|
public void setAppMsgSenders(AppMsgSender[] senders) {
|
|
|
@ -818,7 +822,7 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
|
|
|
|
* 如果是内部调单,密送bd与上面定义的‘emailsBccs’
|
|
|
|
* 如果是内部调单,密送bd与上面定义的‘emailsBccs’
|
|
|
|
* 如果没有勾选发送商户
|
|
|
|
* 如果没有勾选发送商户
|
|
|
|
* 如果不是内部调单,直接发送商户;
|
|
|
|
* 如果不是内部调单,直接发送商户;
|
|
|
|
* 如果是内部调单,则自定义“"18852852189@163.com"为收件人,密送同上
|
|
|
|
* 如果是内部调单,则自定义sys_configs配置中KEY为"rick_interior_send_email"为收件人,密送同上
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Arrays.asList("18852852189@139.com", "1370256381@qq.com")为本地debug模式的测试邮箱
|
|
|
|
* Arrays.asList("18852852189@139.com", "1370256381@qq.com")为本地debug模式的测试邮箱
|
|
|
|
*/
|
|
|
|
*/
|
|
|
@ -829,7 +833,8 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
|
|
|
|
ctx.setVariable("emailsCcs", null);
|
|
|
|
ctx.setVariable("emailsCcs", null);
|
|
|
|
if (PlatformEnvironment.getEnv().isDebug()) {
|
|
|
|
if (PlatformEnvironment.getEnv().isDebug()) {
|
|
|
|
emailsBccs = new ArrayList<>(Arrays.asList(
|
|
|
|
emailsBccs = new ArrayList<>(Arrays.asList(
|
|
|
|
"18852852189@139.com", "1370256381@qq.com"
|
|
|
|
sysConfigManager.getSysConfig().getString("rick_interior_send_email"),
|
|
|
|
|
|
|
|
sysConfigManager.getSysConfig().getString("rick_interior_send_email")
|
|
|
|
));
|
|
|
|
));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
emailsBccs.addAll(bdEmails);
|
|
|
|
emailsBccs.addAll(bdEmails);
|
|
|
@ -839,7 +844,8 @@ public class RiskBusinessServiceImpl implements RiskBusinessService, ManagerTodo
|
|
|
|
if (orderType == RiskOrderTypeEnum.ROYALPAY_ORDER.getOrderType().intValue()) {
|
|
|
|
if (orderType == RiskOrderTypeEnum.ROYALPAY_ORDER.getOrderType().intValue()) {
|
|
|
|
if (PlatformEnvironment.getEnv().isDebug()) {
|
|
|
|
if (PlatformEnvironment.getEnv().isDebug()) {
|
|
|
|
emailsBccs = new ArrayList<>(Arrays.asList(
|
|
|
|
emailsBccs = new ArrayList<>(Arrays.asList(
|
|
|
|
"18852852189@139.com", "1370256381@qq.com"
|
|
|
|
sysConfigManager.getSysConfig().getString("rick_interior_send_email"),
|
|
|
|
|
|
|
|
sysConfigManager.getSysConfig().getString("rick_interior_send_email")
|
|
|
|
));
|
|
|
|
));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
emailsBccs.addAll(bdEmails);
|
|
|
|
emailsBccs.addAll(bdEmails);
|
|
|
|