Merge branch 'fixbug/revert' into 'master'

bug: [none] 解决其他异常导致的接口调用限制状态变更错误

See merge request rays/pcloud-book!844

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/GroupMaterialAccountBizImpl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import com.pcloud.book.group.biz.GroupMaterialAccountBiz;
 import com.pcloud.book.group.entity.GroupMaterialAccount;
 import com.pcloud.book.group.mapper.GroupMaterialAccountMapper;
+import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.facade.wechat.material.service.MaterialService;
 import lombok.extern.slf4j.Slf4j;
@@ -70,9 +71,9 @@ public class GroupMaterialAccountBizImpl implements GroupMaterialAccountBiz {
                             String mediaId = ResponseHandleUtil.parseResponse(materialService.addImgMaterial(account.getAccountId(), COVER_IMAGE), String.class);
                             account.setCoverMediaId(mediaId);
                         }
-                    } catch (Exception e) {
+                    } catch (BizException e) {
                         // 接口调用超过限制,更新状态为达到限制,继续循环，获取下一个公众号
-                        if (account.getStatus() == 1) {
+                        if (e.getMsg() != null && e.getMsg().contains("接口调用超过限制") && account.getStatus() == 1) {
                             account.setStatus(0);
                             account.setUpdateTime(new Date());
                             groupMaterialAccountMapper.update(account);

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/WeixinQrcodeBizImpl.java

@@ -37,7 +37,6 @@ import com.pcloud.common.utils.QrcodeUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
 import com.pcloud.common.utils.cache.redis.JedisClusterUtils;
 import com.pcloud.common.utils.string.StringUtil;
-import com.pcloud.facade.wechat.exceptions.WechatSeviceException;
 import com.pcloud.facade.wechat.material.dto.GroupNewsMaterialAddDTO;
 import com.pcloud.facade.wechat.material.service.MaterialService;
 import com.pcloud.wechatgroup.group.dto.GroupRobotDTO;
@@ -236,12 +235,14 @@ public class WeixinQrcodeBizImpl implements WeixinQrcodeBiz {
                 mediaId = ResponseHandleUtil.parseResponse(materialService.getGroupNewsMaterial(groupNewsMaterialAddDTO), String.class);
                 // 增加素材更新时间字段，方便查询更新失败的群信息
                 groupQrcodeDao.updateMediaId(baseById.getId(), mediaId, new Date());
+            } catch (BizException e) {
+                if (e.getMsg()!=null && e.getMsg().contains("接口调用超过限制")&&activeAccount.getStatus() == 1) {
+                        activeAccount.setStatus(0);
+                        activeAccount.setUpdateTime(new Date());
+                        groupMaterialAccountMapper.update(activeAccount);
+                    }
             } catch (Exception e) {
-                if (activeAccount.getStatus() == 1) {
-                    activeAccount.setStatus(0);
-                    activeAccount.setUpdateTime(new Date());
-                    groupMaterialAccountMapper.update(activeAccount);
-                }
+                LOGGER.error("更新永久图文素材失败！", e);
             }
         }
     }