fix risk

src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java

@@ -34,11 +34,11 @@ public interface RiskAttentionMerchantsMapper {
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
     @Select("SELECT client_moniker FROM risk_attention_merchants " +
-            "WHERE (abn LIKE CONCAT('%',#{abn},'%') ) OR (acn LIKE CONCAT('%',#{acn},'%') ) " +
-            "   OR (contact_phone LIKE CONCAT('%',#{contact_phone},'%') ) " +
-            "   OR (contact_person LIKE CONCAT('%',#{contact_person},'%') ) " +
-            "   OR (client_moniker LIKE CONCAT('%',#{client_moniker},'%') ) " +
-            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) AND is_valid=1")
+            "WHERE (abn = #{abn} ) OR (acn = #{acn} ) " +
+            "   OR (contact_phone = #{contact_phone} ) " +
+            "   OR (contact_person = #{contact_person} ) " +
+            "   OR (client_moniker = #{client_moniker} ) " +
+            "   OR (bank_account_no = #{bank_account_no} ) AND is_valid=1")
     List<JSONObject> listRiskySimilarMerchants(JSONObject params);
 
 }

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

@@ -591,8 +591,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (clientMapper.findClientByMoniker(registery.getClientMoniker()) != null) {
             throw new BadRequestException("error.partner.valid.dumplicate_client_moniker");
         }
-        //检查商户是否进入系统黑名单
-        isRiskyMerchant(partner, null);
+        //2018-09-10,新建商户不检查是否在系统黑名单
+        //isRiskyMerchant(partner, null);
 
         try {
 
@@ -1184,6 +1184,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                     clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_hf_email_notice", allow));
                 }
                 clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow));
+
+                if (channel.equals("Wehcat") || channel.equals("Alipay")) {
+
+                    isRiskyMerchant(client,null);
+                }
                 logger.info(manager.getString("display_name") + "(" + manager.getString("manager_id") + ") switched client " + clientMoniker + " channel "
                         + channel + " to " + allow);
                 return;