Merge branch 'dev-xym-update-corp' of Server/growth-manager into master

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/BuckStrategyV1.java

@@ -348,20 +348,27 @@ public class BuckStrategyV1 implements ReplyStrategyService {
         if (CollectionUtils.isEmpty(bucketDataParam.getVideos())) {
             return result;
         }
-        int existNum = 0;
-        for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
-            int sort = i + 1;
-            Long videoId = bucketDataParam.getVideos().get(i);
-            CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
-            cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
-                    .andGhIdEqualTo(bucketDataParam.getGhId()).andMiniVideoIdEqualTo(videoId).andSortEqualTo(sort);
-            long count = cgiReplyBucketDataMapper.countByExample(cgiReplyBucketDataExample);
-            if (count > 0) {
-                existNum++;
+
+        CgiReplyBucketDataExample countExample = new CgiReplyBucketDataExample();
+        countExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
+                .andGhIdEqualTo(bucketDataParam.getGhId());
+        long allCount = cgiReplyBucketDataMapper.countByExample(countExample);
+        if (allCount == bucketDataParam.getVideos().size()) {
+            int existNum = 0;
+            for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
+                int sort = i + 1;
+                Long videoId = bucketDataParam.getVideos().get(i);
+                CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
+                cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
+                        .andGhIdEqualTo(bucketDataParam.getGhId()).andMiniVideoIdEqualTo(videoId).andSortEqualTo(sort);
+                long count = cgiReplyBucketDataMapper.countByExample(cgiReplyBucketDataExample);
+                if (count > 0) {
+                    existNum++;
+                }
+            }
+            if (existNum == bucketDataParam.getVideos().size()) {
+                return null;
             }
-        }
-        if (existNum == bucketDataParam.getVideos().size()) {
-            return null;
         }
         for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
             int sort = i + 1;

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/ThirdPartyPushMessageStrategyV1.java

@@ -221,20 +221,26 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
                 if (CollectionUtils.isEmpty(bucketDataParam.getVideos())) {
                     return null;
                 }
-                int existNum = 0;
-                for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
-                    int sort = i + 1;
-                    Long videoId = bucketDataParam.getVideos().get(i);
-                    CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
-                    cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
-                            .andGhIdEqualTo(bucketDataParam.getGhId()).andMiniVideoIdEqualTo(videoId).andSortEqualTo(sort);
-                    long count = cgiReplyBucketDataMapper.countByExample(cgiReplyBucketDataExample);
-                    if (count > 0) {
-                        existNum++;
+                CgiReplyBucketDataExample countExample = new CgiReplyBucketDataExample();
+                countExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
+                        .andGhIdEqualTo(bucketDataParam.getGhId());
+                long allCount = cgiReplyBucketDataMapper.countByExample(countExample);
+                if (allCount == bucketDataParam.getVideos().size()) {
+                    int existNum = 0;
+                    for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
+                        int sort = i + 1;
+                        Long videoId = bucketDataParam.getVideos().get(i);
+                        CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
+                        cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
+                                .andGhIdEqualTo(bucketDataParam.getGhId()).andMiniVideoIdEqualTo(videoId).andSortEqualTo(sort);
+                        long count = cgiReplyBucketDataMapper.countByExample(cgiReplyBucketDataExample);
+                        if (count > 0) {
+                            existNum++;
+                        }
+                    }
+                    if (existNum == bucketDataParam.getVideos().size()) {
+                        continue;
                     }
-                }
-                if (existNum == bucketDataParam.getVideos().size()) {
-                    continue;
                 }
                 Map<Long, VideoDetail> videoDetailMap = touLiuHttpClient.getVideoDetailRequest(bucketDataParam.getVideos());
                 for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/WeComPushMessageStrategyV1.java

@@ -219,20 +219,26 @@ public class WeComPushMessageStrategyV1 implements ReplyStrategyService {
                 if (CollectionUtils.isEmpty(bucketDataParam.getVideos())) {
                     return null;
                 }
-                int existNum = 0;
-                for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
-                    int sort = i + 1;
-                    Long videoId = bucketDataParam.getVideos().get(i);
-                    CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
-                    cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
-                            .andGhIdEqualTo(bucketDataParam.getGhId()).andMiniVideoIdEqualTo(videoId).andSortEqualTo(sort);
-                    long count = cgiReplyBucketDataMapper.countByExample(cgiReplyBucketDataExample);
-                    if (count > 0) {
-                        existNum++;
+                CgiReplyBucketDataExample countExample = new CgiReplyBucketDataExample();
+                countExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
+                        .andGhIdEqualTo(bucketDataParam.getGhId());
+                long allCount = cgiReplyBucketDataMapper.countByExample(countExample);
+                if (allCount == bucketDataParam.getVideos().size()) {
+                    int existNum = 0;
+                    for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {
+                        int sort = i + 1;
+                        Long videoId = bucketDataParam.getVideos().get(i);
+                        CgiReplyBucketDataExample cgiReplyBucketDataExample = new CgiReplyBucketDataExample();
+                        cgiReplyBucketDataExample.createCriteria().andIsDeleteEqualTo(0).andStrategyEqualTo(key)
+                                .andGhIdEqualTo(bucketDataParam.getGhId()).andMiniVideoIdEqualTo(videoId).andSortEqualTo(sort);
+                        long count = cgiReplyBucketDataMapper.countByExample(cgiReplyBucketDataExample);
+                        if (count > 0) {
+                            existNum++;
+                        }
+                    }
+                    if (existNum == bucketDataParam.getVideos().size()) {
+                        continue;
                     }
-                }
-                if (existNum == bucketDataParam.getVideos().size()) {
-                    continue;
                 }
                 Map<Long, VideoDetail> videoDetailMap = touLiuHttpClient.getVideoDetailRequest(bucketDataParam.getVideos());
                 for (int i = 0; i < bucketDataParam.getVideos().size(); i++) {