加入判断规则

pcloud-service-book/src/main/java/com/pcloud/book/adnews/biz/impl/AdNewsBizImpl.java

@@ -26,6 +26,7 @@ import com.pcloud.book.adnews.enums.AdContentFromEnum;
 import com.pcloud.book.adnews.enums.AdNewsBanEnum;
 import com.pcloud.book.adnews.dto.AdNewsListParam;
 import com.pcloud.book.adnews.enums.AdNewsContentTypeEnum;
+import com.pcloud.book.adnews.enums.AdNewsSendRuleEnum;
 import com.pcloud.book.adnews.vo.AdNewsGroupRecordVO;
 import com.pcloud.book.adnews.vo.AdNewsMessageStatisticVO;
 import com.pcloud.book.base.exception.BookBizException;
@@ -427,9 +428,11 @@ public class AdNewsBizImpl implements AdNewsBiz {
             groupQrcodeFoAdDTO.setAdNewsList(adNewsList.stream().collect(Collectors.toList()));
         }
 
-        List<AdNews> _adNewsList = new ArrayList<>();
         // 如果自有公众号的数据条数少于要发送的条数，则用系统推荐公众号的补齐剩余的条数
         if(adNewsList.size() < adNewsSet.getSendCount()){
+            List<AdNews> _adNewsList = new ArrayList<>();
+
+            if(AdNewsSendRuleEnum.MATCH_LABEL.key == adNewsSet.getSendRule()){
                 // 根据群批量查找社群码的标签
                 setGroupLabelName(groupQrcodeFoAdDTOS);
                 // 标签去重进行匹配新闻
@@ -460,6 +463,16 @@ public class AdNewsBizImpl implements AdNewsBiz {
                         }
                     }
                 }
+            }else {
+                // 直接用最新数据补齐剩余条数
+                _adNewsList = adNewsDao.getNewsToSendBySetIdAndAdviser(adNewsSet.getId(), adNewsSet.getCreateUser(), adNewsSet.getSendCount() - adNewsList.size());
+                if (!ListUtils.isEmpty(_adNewsList)) {
+                    for (GroupQrcodeFoAdDTO groupQrcodeFoAdDTO : groupQrcodeFoAdDTOS)
+                    {
+                        groupQrcodeFoAdDTO.getAdNewsList().addAll(_adNewsList);
+                    }
+                }
+            }
         }
     }