分组群发 fwhGhIdList 配置修改

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CoreServiceImpl.java

@@ -702,7 +702,8 @@ public class CoreServiceImpl implements CoreService {
             if (sendCount >= 1) {
                 return false;
             }
-            if ((fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId()))
+            if ((fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId())
+                    && Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()))
                     || (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal()))) {
                 // 服务号分组求发每天最多尝试10次
                 if (planAccount.getRetryCount() >= 10) {
@@ -846,7 +847,8 @@ public class CoreServiceImpl implements CoreService {
         }
 
         if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())
-                || (fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId()))) {
+                || (fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId())
+                && Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()))) {
             pushBatchGroupPushTask(planAccount, pushContentList, sendIds);
         } else {
             CreatePushTaskParam gzhPushParam = getCreatePushTaskParam(planAccount, pushContentList);
@@ -1478,7 +1480,8 @@ public class CoreServiceImpl implements CoreService {
                     planAccountService.updateStatus(2, planAccountId);
                 }
                 if (Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.batch_group_publish.getVal())
-                        || (fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId()))) {
+                        || (fwhGhIdList != null && fwhGhIdList.contains(planAccount.getGhId())
+                        && Objects.equals(planAccount.getPushType(), PublishGzhPushTypeEnum.auto_group_publish.getVal()))) {
                     GroupSendResultExample groupSendResultExample = new GroupSendResultExample();
                     groupSendResultExample.createCriteria().andPushIdEqualTo(pushId);
                     List<GroupSendResult> groupSendResults = groupSendResultMapper.selectByExample(groupSendResultExample);