Merge remote-tracking branch 'origin/develop' into develop

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -1185,12 +1185,22 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                 }
                 clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow));
 
-                if (channel.equals("wechat") || channel.equals("alipay")) {
-
-                    isRiskyMerchant(client,null);
-                }
                 logger.info(manager.getString("display_name") + "(" + manager.getString("manager_id") + ") switched client " + clientMoniker + " channel "
                         + channel + " to " + allow);
+
+                if (allow == true) {
+                    if (channel.equals("wechat") || channel.equals("alipay")) {
+                        int clientId = client.getIntValue("client_id");
+                        List<JSONObject> clientBankAccounts = clientBankAccountMapper.clientBankAccounts(clientId);
+
+                        if (clientBankAccounts.size() > 0 ) {
+                            isRiskyMerchant(client,clientBankAccounts.get(0));
+                        }else {
+                            isRiskyMerchant(client,null);
+                        }
+
+                    }
+                }
                 return;
             }
         }
@@ -3844,9 +3854,16 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         List<JSONObject> listRiskySimilarMerchants = riskAttentionMerchantsMapper.listRiskySimilarMerchants(needCheckParams);
         if (listRiskySimilarMerchants.size() > 0) {
             StringBuilder appendStr = new StringBuilder();
-            listRiskySimilarMerchants.forEach(json -> appendStr.append(json.getString("client_moniker")).append(","));
+            StringBuilder infoStr = new StringBuilder();
+
+            listRiskySimilarMerchants.forEach(json -> {
+                appendStr.append(json.getString("client_moniker")).append(",");
+                JSONObject riskInfo = riskAttentionMerchantsMapper.findByClientMoniker(json.getString("client_moniker"));
+                infoStr.append("ABN = " + riskInfo.getString("abn") + ",ACN = " + riskInfo.getString("acn") + ",contact_phone = " + riskInfo.getString("contact_phone") + ",contact_person = " + riskInfo.getString("contact_person") + ",bank_account_no = " + riskInfo.getString("bank_account_no"));
+            });
+
             appendStr.deleteCharAt(appendStr.length() - 1);
-            throw new BadRequestException("该商户信息已经进入系统黑名单，关联商户为【" + appendStr + "】");
+            throw new BadRequestException("该商户信息已经进入系统黑名单，关联商户为【" + appendStr.toString().toUpperCase() + "】【"  + infoStr + "】");
         }
 
     }