[Y] 修复审核商户报错:无账户导致异常

master
taylor.dang 4 years ago
parent 17083b8004
commit 39ee9a1505

@ -5,15 +5,14 @@
<parent>
<groupId>au.com.royalpay.payment</groupId>
<artifactId>payment-parent</artifactId>
<version>2.2.5</version>
<version>2.2.7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>manage</artifactId>
<version>2.3.45</version>
<version>2.3.46</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>
<docker-image.version>${project.version}</docker-image.version>
</properties>
<dependencies>
@ -266,7 +265,7 @@
<image>192.168.0.84:5000/royalpay/manage-dev</image>
<tags>
<tag>latest</tag>
<tag>${docker-image.version}</tag>
<tag>${project.version}</tag>
</tags>
</to>
<extraDirectories>
@ -301,7 +300,7 @@
<image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
</from>
<to>
<image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${docker-image.version}
<image>hkccr.ccs.tencentyun.com/cross-payment-dev/manage-dev:${project.version}
</image>
</to>
<extraDirectories>
@ -336,7 +335,7 @@
<image>hkccr.ccs.tencentyun.com/rpay/serverjre:openj9</image>
</from>
<to>
<image>hkccr.ccs.tencentyun.com/rpay/manage:${docker-image.version}</image>
<image>hkccr.ccs.tencentyun.com/rpay/manage:${project.version}</image>
</to>
<extraDirectories>
<paths>

@ -1153,8 +1153,12 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "skip_clearing", false));
if (client.getIntValue("source") == 4 || client.getIntValue("source") == 5) {
List<JSONObject> accounts = clientAccountMapper.listAdminAccounts(client.getIntValue("client_id"));
JSONObject account = accounts.get(0);
sendInitEmail(client, account.getString("username"), "*****", false);
if (accounts == null || accounts.size() <= 0) {
initAdminUserAndSendEmail(manager, clientMoniker, client, false);
} else {
JSONObject account = accounts.get(0);
sendInitEmail(client, account.getString("username"), "*****", false);
}
// sendInitEmail(manager, client, account.getString("username"), "*****");
saveClientAuditProcess(client.getIntValue("client_id"), open_status, 5, "合规通过", manager, 1);
clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "skip_clearing", false));

Loading…
Cancel
Save