Merge branch '20250408-wyp-contentPlatform' into test

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/ContentPlatformPlanService.java

@@ -6,10 +6,26 @@ import com.tzld.piaoquan.api.model.vo.contentplatform.GzhPlanItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.QwPlanItemVO;
 import com.tzld.piaoquan.api.model.vo.contentplatform.VideoContentItemVO;
 import com.tzld.piaoquan.growth.common.utils.page.Page;
+import org.springframework.util.StringUtils;
 
 import java.util.List;
 
 public interface ContentPlatformPlanService {
+
+    static String getVideoTitle(ContentPlatformGzhPlanVideo video) {
+        if (StringUtils.hasText(video.getCustomTitle())) {
+            return video.getCustomTitle();
+        }
+        return video.getTitle();
+    }
+
+    static String getVideoCover(ContentPlatformGzhPlanVideo video) {
+        if (StringUtils.hasText(video.getCustomCover())) {
+            return video.getCustomCover();
+        }
+        return video.getCover();
+    }
+
     Page<GzhPlanItemVO> gzhPlanList(GzhPlanListParam param);
 
     void gzhPlanSave(GzhPlanSaveParam param);

api-module/src/main/java/com/tzld/piaoquan/api/service/contentplatform/impl/ContentPlatformPlanServiceImpl.java

@@ -118,7 +118,7 @@ public class ContentPlatformPlanServiceImpl implements ContentPlatformPlanServic
             List<ContentPlatformGzhPlanVideo> videoListByPlanId = videoMap.get(gzhPlan.getId());
             if (CollectionUtils.isNotEmpty(videoListByPlanId)) {
                 planItemVO.setVideoCount(videoListByPlanId.size());
-                List<String> titleList = videoListByPlanId.stream().map(ContentPlatformGzhPlanVideo::getTitle)
+                List<String> titleList = videoListByPlanId.stream().map(ContentPlatformPlanService::getVideoTitle)
                         .collect(Collectors.toList());
                 planItemVO.setTitle(titleList);
                 List<GzhPlanVideoContentItemVO> videoVOList = new ArrayList<>();

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

@@ -382,10 +382,10 @@ public class BuckStrategyV1 implements ReplyStrategyService {
             ContentPlatformGzhPlanVideo gzhPlanVideo = gzhPlanVideoMap.get(videoId);
             // 内容合作平台视频标题和封面
             if (Objects.nonNull(gzhPlanVideo)) {
-                cgiReplyBucketData.setTitle(gzhPlanVideo.getTitle());
-                if (StringUtils.isNotEmpty(gzhPlanVideo.getCover())) {
+                cgiReplyBucketData.setTitle(ContentPlatformPlanService.getVideoTitle(gzhPlanVideo));
+                if (StringUtils.isNotEmpty(ContentPlatformPlanService.getVideoCover(gzhPlanVideo))) {
                     String coverSuffix = videoDetail.getCover().substring(videoDetail.getCover().indexOf("/watermark"));
-                    cgiReplyBucketData.setCoverUrl(gzhPlanVideo.getCover() + coverSuffix);
+                    cgiReplyBucketData.setCoverUrl(ContentPlatformPlanService.getVideoCover(gzhPlanVideo) + coverSuffix);
                 }
             } else {
                 if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {

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

@@ -255,10 +255,10 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
                     ContentPlatformGzhPlanVideo gzhPlanVideo = gzhPlanVideoMap.get(videoId);
                     // 内容合作平台视频标题和封面
                     if (Objects.nonNull(gzhPlanVideo)) {
-                        cgiReplyBucketData.setTitle(gzhPlanVideo.getTitle());
-                        if (StringUtils.isNotEmpty(gzhPlanVideo.getCover())) {
+                        cgiReplyBucketData.setTitle(ContentPlatformPlanService.getVideoTitle(gzhPlanVideo));
+                        if (StringUtils.isNotEmpty(ContentPlatformPlanService.getVideoCover(gzhPlanVideo))) {
                             String coverSuffix = videoDetail.getCover().substring(videoDetail.getCover().indexOf("/watermark"));
-                            cgiReplyBucketData.setCoverUrl(gzhPlanVideo.getCover() + coverSuffix);
+                            cgiReplyBucketData.setCoverUrl(ContentPlatformPlanService.getVideoCover(gzhPlanVideo) + coverSuffix);
                         }
                     } else {
                         if (videoDetail != null && StringUtils.isNotEmpty(videoDetail.getCover())) {