Merge branch 'develop'

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

@@ -2071,7 +2071,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
             throw new InvalidShortIdException();
         }
         checkOrgPermission(manager, client);
-        if (!StringUtils.isNotBlank(master_merchant)) {
+        if (StringUtils.isNotBlank(master_merchant)) {
             //throw new NotFoundException("Invalid Input");
             JSONObject master_client = getClientInfoByMoniker(master_merchant);
             if (master_client == null) {

src/main/java/au/com/royalpay/payment/manage/tradelog/refund/events/listeners/NoticeRefundReviewListener.java

@@ -7,6 +7,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi;
 import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
+import au.com.royalpay.payment.tools.env.SysConfigManager;
 import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,6 +30,8 @@ public class NoticeRefundReviewListener implements ApplicationListener<NewRefund
     private ManagerMapper managerMapper;
     @Resource
     private MpWechatApiProvider mpWechatApiProvider;
+    @Resource
+    private SysConfigManager sysConfigManager;
 
     @Override
     public void onApplicationEvent(NewRefundReviewEvent event) {
@@ -42,10 +45,10 @@ public class NoticeRefundReviewListener implements ApplicationListener<NewRefund
         }
 
         //风控团队接收
-        List<JSONObject> accounts = managerMapper.listRiskManagers();
+        String openidStrings = sysConfigManager.getSysConfig().getString("refund_audit_notice_people");
-        for (JSONObject account : accounts) {
+        String[] openids = openidStrings.split(",");
-            String wechatOpenid = account.getString("wx_openid");
+        for (String openid : openids) {
-            sendRefundAuditNotify(event, client, operator, wechatOpenid);
+            sendRefundAuditNotify(event, client, operator, openid);
         }
     }