Merge branch 'developer' into 'master'

素材列表fix

See merge request !105

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/CheckQywxSettingApiServiceImpl.java

@@ -65,26 +65,31 @@ public class CheckQywxSettingApiServiceImpl implements CheckQywxSettingApiServic
 
     @Override
     public void saveFriendCallback(String wxEnterpriseId, ExternalUserDTO externalUserDTO, MemberUnionidRelatedDTO dto) {
-        if (null == externalUserDTO) {
-            messageAlert(wxEnterpriseId, dto, null);
-            //todo 告警
-            return;
-        }
-        CheckFriendSettingDTO friendSetting = this.getFriendSetting();
-        if (!wxEnterpriseId.equals(friendSetting.getWxEnterpriseId())) {
-            return;
-        }
-        if (!friendSetting.getName().equals(externalUserDTO.getName())) {
-            return;
-        }
-        RedissonClient redisClient = RedisUtil.getRedisClient();
-        RMap<Object, Object> map = redisClient.getMap(FRIEND_SETTING_VAL_KEY);
-        if (SELF_APP.equals(dto.getSuiteid())) {
-            map.put(SELF_APP, externalUserDTO);
-        } else {
-            map.put(THIRD_APP, externalUserDTO);
+        try {
+            if (null == externalUserDTO) {
+                messageAlert(wxEnterpriseId, dto, null);
+                //todo 告警
+                return;
+            }
+            CheckFriendSettingDTO friendSetting = this.getFriendSetting();
+            if (!wxEnterpriseId.equals(friendSetting.getWxEnterpriseId())) {
+                return;
+            }
+            if (!friendSetting.getName().equals(externalUserDTO.getName())) {
+                return;
+            }
+            RedissonClient redisClient = RedisUtil.getRedisClient();
+            RMap<Object, Object> map = redisClient.getMap(FRIEND_SETTING_VAL_KEY);
+            if (SELF_APP.equals(dto.getSuiteid())) {
+                map.put(SELF_APP, externalUserDTO);
+            } else {
+                map.put(THIRD_APP, externalUserDTO);
+            }
+            messageAlert(wxEnterpriseId, dto, "好友提醒：" + dto.getSuiteid());
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("通知异常：{}", e);
         }
-        messageAlert(wxEnterpriseId, dto, "好友提醒：" + dto.getSuiteid());
     }
 
     /**