GlobalAward返回最大的参赛者编号

src/main/java/com/ai/da/common/security/filter/AuthenticationFilter.java

@@ -64,7 +64,7 @@ public class AuthenticationFilter extends OncePerRequestFilter {
                     "/api/global-award/uploads/pdf/init", "/api/global-award/uploads/pdf/chunk", "/api/global-award/uploads/pdf/complete", "/api/global-award/uploads/pdf/status",
                     "/api/global-award/uploads/video/init", "/api/global-award/uploads/video/chunk", "/api/global-award/uploads/video/complete", "/api/global-award/uploads/video/status",
                     "/api/global-award/contestants/save", "/api/global-award/contestants/by-email", "/api/global-award/checkEmail", "/api/global-award/checkCode","/api/global-award/contestants/export",
-                    "/api/global-award/contestants/export/files"
+                    "/api/global-award/contestants/export/files", "/api/global-award/contestants/count"
             );
 
     @Override

src/main/java/com/ai/da/controller/GlobalAwardController.java

@@ -4,6 +4,7 @@ import com.ai.da.common.response.Response;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.dto.ContestantDTO;
 import com.ai.da.model.vo.CheckOTPVO;
+import com.ai.da.model.vo.ContestantCountVO;
 import com.ai.da.service.GlobalAwardService;
 import com.ai.da.service.upload.UploadService;
 import com.ai.da.service.upload.UploadTask;
@@ -176,10 +177,25 @@ public class GlobalAwardController {
     }
 
     @PostMapping("/contestants/export/files")
-    @ApiOperation(value = "导出参赛者文件到本地", notes = "根据参赛者编号范围导出PDF和视频文件到本地temp/uploads/contestants目录")
+    @ApiOperation(value = "导出参赛者文件为ZIP", notes = "根据参赛者编号范围导出PDF、视频和信息文件为ZIP，直接响应给浏览器")
-    public Response<Integer> exportContestantFiles(@ApiParam(value = "参赛者文件导出请求", required = true) @RequestBody ContestantExportRequest request) throws Exception {
+    public void exportContestantFiles(@ApiParam(value = "参赛者文件导出请求", required = true) @RequestBody ContestantExportRequest request, HttpServletResponse response) throws Exception {
-        int exportedCount = globalAwardService.exportContestantFiles(request.getMinContestantNumber(), request.getMaxContestantNumber());
+        byte[] zipData = globalAwardService.exportContestantFilesAsZip(request.getMinContestantNumber(), request.getMaxContestantNumber());
-        return Response.success(exportedCount);
+        if (zipData.length == 0) {
+            response.setStatus(HttpServletResponse.SC_NOT_FOUND);
+            response.getWriter().write("No contestants found in the specified range.");
+            return;
+        }
+        response.setContentType("application/zip");
+        response.setHeader("Content-Disposition", "attachment; filename=\"contestants.zip\"");
+        response.setContentLength(zipData.length);
+        response.getOutputStream().write(zipData);
+        response.getOutputStream().flush();
+    }
+
+    @GetMapping("/contestants/count")
+    @ApiOperation(value = "查询参赛者总数", notes = "查询数据库中参赛者的总数量和最大参赛者编号")
+    public Response<ContestantCountVO> getContestantCount() {
+        return Response.success(globalAwardService.getContestantCount());
     }
 
 }

src/main/java/com/ai/da/model/vo/ContestantCountVO.java

@@ -0,0 +1,17 @@
+package com.ai.da.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ContestantCountVO {
+
+    private Long count;
+
+    private Integer maxContestantNumber;
+}

src/main/java/com/ai/da/service/GlobalAwardService.java

@@ -2,6 +2,7 @@ package com.ai.da.service;
 
 import com.ai.da.model.dto.ContestantDTO;
 import com.ai.da.model.vo.CheckOTPVO;
+import com.ai.da.model.vo.ContestantCountVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Map;
@@ -33,12 +34,18 @@ public interface GlobalAwardService {
     void saveContestantsToLocal() throws Exception;
 
     /**
-     * 根据参赛者编号范围导出参赛者文件到本地目录
+     * 将参赛者文件打包为 ZIP 并返回字节数组（不落盘，直接响应给浏览器）
      * @param minContestantNumber 最小参赛者编号
      * @param maxContestantNumber 最大参赛者编号
-     * @return 导出的参赛者数量
+     * @return ZIP 文件的字节数组
      */
-    int exportContestantFiles(Integer minContestantNumber, Integer maxContestantNumber) throws Exception;
+    byte[] exportContestantFilesAsZip(Integer minContestantNumber, Integer maxContestantNumber) throws Exception;
+
+    /**
+     * 查询参赛者总数和最大参赛者编号
+     * @return 参赛者数量和最大参赛者编号
+     */
+    ContestantCountVO getContestantCount();
 }
 
 

src/main/java/com/ai/da/service/impl/GlobalAwardServiceImpl.java

@@ -12,6 +12,7 @@ import com.ai.da.mapper.primary.entity.Notification;
 import com.ai.da.model.dto.ContestantDTO;
 import com.ai.da.model.dto.PublishSysNotificationDTO;
 import com.ai.da.model.vo.CheckOTPVO;
+import com.ai.da.model.vo.ContestantCountVO;
 import com.ai.da.service.GlobalAwardService;
 import com.ai.da.service.MessageCenterService;
 import com.alibaba.fastjson.JSON;
@@ -26,24 +27,22 @@ import org.springframework.transaction.annotation.Transactional;
 
 import jakarta.annotation.Resource;
 
+import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.io.ByteArrayOutputStream;
+import java.util.zip.ZipEntry;
-import java.io.IOException;
-
-import jakarta.servlet.http.HttpServletResponse;
 
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.io.FileOutputStream;
-import java.time.format.DateTimeFormatter;
 
 @Service
 @Slf4j
@@ -265,11 +264,9 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
                 r.createCell(ci++).setCellValue(cst.getPhoneNumber() == null ? "" : cst.getPhoneNumber());
                 r.createCell(ci++).setCellValue(cst.getDesignTitle() == null ? "" : cst.getDesignTitle());
                 r.createCell(ci++).setCellValue(cst.getDesignDescription() == null ? "" : cst.getDesignDescription());
-//                r.createCell(ci++).setCellValue(cst.getPdfPath() == null ? "" : cst.getPdfPath());
+                r.createCell(ci++).setCellValue(cst.getPdfPath() == null ? "" : cst.getPdfPath());
-//                r.createCell(ci++).setCellValue(cst.getVideoPath() == null ? "" : cst.getVideoPath());
+                r.createCell(ci++).setCellValue(cst.getVideoPath() == null ? "" : cst.getVideoPath());
-                // 视频时长（秒）
                 r.createCell(ci++).setCellValue(cst.getVideoDuration() == null ? "" : cst.getVideoDuration().toString());
-                // 视频大小、PDF 大小：以 MB 导出，保留两位小数
                 if (cst.getVideoSize() == null) {
                     r.createCell(ci++).setCellValue("");
                 } else {
@@ -332,11 +329,9 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
                 r.createCell(ci++).setCellValue(cst.getPhoneNumber() == null ? "" : cst.getPhoneNumber());
                 r.createCell(ci++).setCellValue(cst.getDesignTitle() == null ? "" : cst.getDesignTitle());
                 r.createCell(ci++).setCellValue(cst.getDesignDescription() == null ? "" : cst.getDesignDescription());
-//                r.createCell(ci++).setCellValue(cst.getPdfPath() == null ? "" : cst.getPdfPath());
+                r.createCell(ci++).setCellValue(cst.getPdfPath() == null ? "" : cst.getPdfPath());
-//                r.createCell(ci++).setCellValue(cst.getVideoPath() == null ? "" : cst.getVideoPath());
+                r.createCell(ci++).setCellValue(cst.getVideoPath() == null ? "" : cst.getVideoPath());
-                // 视频时长（秒）
                 r.createCell(ci++).setCellValue(cst.getVideoDuration() == null ? "" : cst.getVideoDuration().toString());
-                // 视频大小、PDF 大小：以 MB 导出，保留两位小数
                 if (cst.getVideoSize() == null) {
                     r.createCell(ci++).setCellValue("");
                 } else {
@@ -480,7 +475,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
     }
 
     @Override
-    public int exportContestantFiles(Integer minContestantNumber, Integer maxContestantNumber) throws Exception {
+    public byte[] exportContestantFilesAsZip(Integer minContestantNumber, Integer maxContestantNumber) throws Exception {
         if (minContestantNumber == null || maxContestantNumber == null) {
             throw new BusinessException("minContestantNumber and maxContestantNumber are required.");
         }
@@ -488,7 +483,7 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
             throw new BusinessException("minContestantNumber cannot be greater than maxContestantNumber.");
         }
 
-        // 1. 根据contestantNumber范围查询参赛者
+        // 1. 根据 contestantNumber 范围查询参赛者
         QueryWrapper<Contestant> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda()
                 .ge(Contestant::getContestantNumber, minContestantNumber)
@@ -498,90 +493,125 @@ public class GlobalAwardServiceImpl implements GlobalAwardService {
 
         if (contestants.isEmpty()) {
             log.info("No contestants found in range [{}, {}]", minContestantNumber, maxContestantNumber);
-            return 0;
+            return new byte[0];
         }
 
-        // 2. 创建基础目录
+        // 2. 在内存中构建 ZIP
-        String baseDir = uploadDir + "/contestants";
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        Path basePath = Paths.get(baseDir).toAbsolutePath();
+             java.util.zip.ZipOutputStream zos = new java.util.zip.ZipOutputStream(baos)) {
-        Files.createDirectories(basePath);
-        log.info("Base directory created: {}", basePath);
 
-        int exportedCount = 0;
+            for (Contestant contestant : contestants) {
-
+                Integer contestantNumber = contestant.getContestantNumber();
-        // 3. 遍历每个参赛者，下载文件
+                if (contestantNumber == null) {
-        for (Contestant contestant : contestants) {
+                    log.warn("Contestant {} has no contestantNumber, skipping", contestant.getId());
-            Integer contestantNumber = contestant.getContestantNumber();
+                    continue;
-            if (contestantNumber == null) {
-                log.warn("Contestant {} has no contestantNumber, skipping", contestant.getId());
-                continue;
-            }
-
-            // 创建参赛者文件夹
-            String contestantDir = baseDir + "/" + contestantNumber;
-            Path contestantPath = Paths.get(contestantDir);
-            Files.createDirectories(contestantPath);
-
-            // 下载PDF文件
-            String pdfPath = contestant.getPdfPath();
-            if (StringUtils.isNotBlank(pdfPath)) {
-                try {
-                    String fileName = pdfPath.contains("/") ?
-                            pdfPath.substring(pdfPath.lastIndexOf("/") + 1) : "design.pdf";
-                    downloadFileFromMinio(pdfPath, contestantPath.toString(), "design.pdf");
-                    log.info("Downloaded PDF for contestant {}", fileName);
-                } catch (Exception e) {
-                    log.error("Failed to download PDF for contestant {}: {}", contestantNumber, e.getMessage());
                 }
-            }
 
-            // 下载视频文件
+                String dirPrefix = contestantNumber + "/";
-            String videoPath = contestant.getVideoPath();
+
-            if (StringUtils.isNotBlank(videoPath)) {
+                // 添加 PDF 文件
-                try {
+                String pdfPath = contestant.getPdfPath();
-                    // 根据路径判断视频格式
+                if (StringUtils.isNotBlank(pdfPath)) {
+                    addMinioFileToZip(zos, pdfPath, dirPrefix + "design.pdf");
+                }
+
+                // 添加视频文件
+                String videoPath = contestant.getVideoPath();
+                if (StringUtils.isNotBlank(videoPath)) {
                     String fileName = videoPath.contains("/") ?
                             videoPath.substring(videoPath.lastIndexOf("/") + 1) : "video.mp4";
-                    downloadFileFromMinio(videoPath, contestantPath.toString(), fileName);
+                    addMinioFileToZip(zos, videoPath, dirPrefix + fileName);
-                    log.info("Downloaded video for contestant {}", contestantNumber);
-                } catch (Exception e) {
-                    log.error("Failed to download video for contestant {}: {}", contestantNumber, e.getMessage());
                 }
+
+                // 添加参赛者信息 txt 文件
+                StringBuilder sb = new StringBuilder();
+                sb.append("=== Contestant Information ===\n\n");
+                sb.append("ID: ").append(nullSafe(contestant.getId())).append("\n");
+                sb.append("Email: ").append(nullSafe(contestant.getEmail())).append("\n");
+                sb.append("Contestant Number: ").append(contestantNumber).append("\n");
+                sb.append("First Name: ").append(nullSafe(contestant.getFirstName())).append("\n");
+                sb.append("Last Name: ").append(nullSafe(contestant.getLastName())).append("\n");
+                sb.append("Gender: ").append(nullSafe(contestant.getGender())).append("\n");
+                sb.append("Occupation: ").append(nullSafe(contestant.getOccupation())).append("\n");
+                sb.append("Age: ").append(contestant.getAge() != null ? contestant.getAge() : "N/A").append("\n");
+                sb.append("Country/Region/City: ").append(nullSafe(contestant.getCountryRegionCity())).append("\n");
+                sb.append("Phone Number: ").append(nullSafe(contestant.getPhoneNumber())).append("\n");
+                sb.append("Design Title: ").append(nullSafe(contestant.getDesignTitle())).append("\n");
+                sb.append("Design Description: ").append(nullSafe(contestant.getDesignDescription())).append("\n");
+                sb.append("PDF Path: ").append(nullSafe(pdfPath)).append("\n");
+                sb.append("PDF Size (bytes): ").append(contestant.getPdfSize() != null ? contestant.getPdfSize() : "N/A").append("\n");
+                sb.append("Video Path: ").append(nullSafe(videoPath)).append("\n");
+                sb.append("Video Duration (seconds): ").append(contestant.getVideoDuration() != null ? contestant.getVideoDuration() : "N/A").append("\n");
+                sb.append("Video Size (bytes): ").append(contestant.getVideoSize() != null ? contestant.getVideoSize() : "N/A").append("\n");
+                sb.append("Created At: ").append(contestant.getCreatedAt() != null ? contestant.getCreatedAt() : "N/A").append("\n");
+                sb.append("Updated At: ").append(contestant.getUpdatedAt() != null ? contestant.getUpdatedAt() : "N/A").append("\n");
+
+                ZipEntry infoEntry = new ZipEntry(dirPrefix + "contestant_info.txt");
+                zos.putNextEntry(infoEntry);
+                zos.write(sb.toString().getBytes(java.nio.charset.StandardCharsets.UTF_8));
+                zos.closeEntry();
+                log.info("Added contestant {} info to zip", contestantNumber);
             }
 
-            exportedCount++;
+            zos.finish();
+            log.info("ZIP built for {} contestants, size: {} bytes", contestants.size(), baos.size());
+            return baos.toByteArray();
         }
-
-        log.info("Exported {} contestants' files to {}", exportedCount, basePath);
-        return exportedCount;
     }
 
     /**
-     * 从MinIO下载文件到本地
+     * 将 MinIO 文件流式写入 ZIP，不落盘
-     * @param minioPath MinIO路径 (格式: bucketName/objectPath)
+     * @param zos       ZIP 输出流
-     * @param localDir 本地目录
+     * @param minioPath MinIO 路径（格式: bucketName/objectPath）
-     * @param fileName 本地文件名
+     * @param entryName ZIP 条目名称
      */
-    private void downloadFileFromMinio(String minioPath, String localDir, String fileName) {
+    private void addMinioFileToZip(java.util.zip.ZipOutputStream zos, String minioPath, String entryName) {
         if (StringUtils.isBlank(minioPath)) {
             return;
         }
-
-        // 从路径中提取bucket名称和对象名称
         int index = minioPath.indexOf("/");
         if (index == -1) {
             log.warn("Invalid MinIO path: {}", minioPath);
             return;
         }
-
         String bucketName = minioPath.substring(0, index);
         String objectName = minioPath.substring(index + 1);
 
-        // 构建本地文件完整路径
+        try (InputStream in = minioUtil.download(bucketName, objectName)) {
-        Path localFilePath = Paths.get(localDir, fileName);
+            ZipEntry entry = new ZipEntry(entryName);
+            zos.putNextEntry(entry);
+            byte[] buffer = new byte[8192];
+            int bytesRead;
+            while ((bytesRead = in.read(buffer)) != -1) {
+                zos.write(buffer, 0, bytesRead);
+            }
+            zos.closeEntry();
+            log.info("Added {} to zip ({} bytes)", entryName, entry.getSize());
+        } catch (Exception e) {
+            log.error("Failed to add {} to zip: {}", entryName, e.getMessage());
+        }
+    }
 
-        // 下载文件
+    @Override
-        minioUtil.downloadMinioObjectToLocal(bucketName, objectName, localFilePath.toString());
+    public ContestantCountVO getContestantCount() {
+        long count = contestantMapper.selectCount(null);
+        Integer maxContestantNumber = null;
+        QueryWrapper<Contestant> qMax = new QueryWrapper<>();
+        qMax.isNotNull("contestant_number");
+        qMax.orderByDesc("contestant_number");
+        qMax.last("LIMIT 1");
+        Contestant last = contestantMapper.selectOne(qMax);
+        if (last != null) {
+            maxContestantNumber = last.getContestantNumber();
+        }
+        return ContestantCountVO.builder()
+                .count(count)
+                .maxContestantNumber(maxContestantNumber)
+                .build();
+    }
+
+    private String nullSafe(String value) {
+        return value != null ? value : "N/A";
     }
 }
 

src/main/java/com/ai/da/service/impl/StripeServiceImpl.java

@@ -1060,11 +1060,12 @@ public class StripeServiceImpl implements StripeService {
         String periodEnd = DateUtil.changeTimeStampFormat(subscriptionInfo.getCurrentPeriodEnd(), "seconds", CommonConstant.TIME_FORMAT_yyyy_MM_dd_HH_mm_ss);
 
         qwPI.lambda().eq(PaymentInfo::getOrderNo, subscriptionInfo.getOrderNo())
+                .eq(PaymentInfo::getTradeState, "paid")
                 .between(PaymentInfo::getCreateTime, periodStart, periodEnd)
                 .orderByDesc(PaymentInfo::getId);
         List<PaymentInfo> paymentInfos = paymentInfoMapper.selectList(qwPI);
         if (paymentInfos.isEmpty()) {
-            log.info("不发送邮件，原因：【根据order_no:{},查询到的paymentInfos为空】", orderNo);
+            log.info("不发送邮件，原因：【根据order_no:{},查询到的成功的paymentInfos为空】", orderNo);
             return false;
         }
         PaymentInfo paymentInfo = paymentInfos.get(0);

src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java

@@ -905,15 +905,15 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                     }
                 }
                 // 将构建好的结果对象添加到返回列表
-                results.add(magicToolResultVO);
+//                results.add(magicToolResultVO);
             } else if (Objects.isNull(magicToolResultVO)) {
                 // 如果Redis中没有结果对象，创建执行中状态的结果对象
                 magicToolResultVO = new MagicToolResultVO(taskId, "Executing");
-                results.add(magicToolResultVO);
+//                results.add(magicToolResultVO);
-            } else {
+            }/* else {
                 // 如果Redis中有结果对象但URL为空，直接添加到返回列表
                 results.add(magicToolResultVO);
-            }
+            }*/
 
             // 收集任务状态用于统计
             if (!StringUtil.isNullOrEmpty(magicToolResultVO.getStatus())) collect.add(magicToolResultVO.getStatus());
@@ -1461,12 +1461,16 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 if (StringUtil.isNullOrEmpty(fluxResult)) {
                     toProductImageResult.setStatus("Fail");
                     toProductImageResultMapper.updateById(toProductImageResult);
-                    sortRank(toProductImageResult);
+                    if (toProductImageResult.getIsLike() != null && toProductImageResult.getIsLike() == 1) {
+                        sortRank(toProductImageResult);
+                    }
                     results.add(new MagicToolResultVO(taskId, "Fail"));
                 } else if (fluxResult.equals("Fail") || fluxResult.equals("Pending")) {
                     toProductImageResult.setStatus(fluxResult);
                     toProductImageResultMapper.updateById(toProductImageResult);
-                    sortRank(toProductImageResult);
+                    if (fluxResult.equals("Fail") && toProductImageResult.getIsLike() != null && toProductImageResult.getIsLike() == 1) {
+                        sortRank(toProductImageResult);
+                    }
                     results.add(new MagicToolResultVO(taskId, fluxResult));
                 } else {
                     results.add(processFluxResult(fluxResult, toProductImageResult, taskId, toProductImageRecord.getPrompt()));
@@ -2203,10 +2207,14 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                         childCollectionQw.lambda().orderByAsc(CollectionSort::getSort);
                         List<CollectionSort> childSortList = collectionSortMapper.selectList(childCollectionQw);
                         List<AllCollectionVO> childList = new ArrayList<>();
+                        // 收集需要删除的失败记录ID，用于后续统一清理并重新排序
+                        List<Long> failedSortIds = new ArrayList<>();
                         for (CollectionSort userLikeSort : childSortList) {
                             if (userLikeSort.getRelationType().equals(CollectionType.TO_PRODUCT_IMAGE.getValue())) {
                                 ToProductImageResult toProductImageResult = toProductImageResultMapper.selectById(userLikeSort.getRelationId());
                                 if (isGenerateTaskFailed(toProductImageResult.getStatus(), toProductImageResult.getCreateTime())) {
+                                    failedSortIds.add(userLikeSort.getId());
+                                    log.info("【获取内容】TO_PRODUCT_IMAGE结果失败，relationId={}，即将从collection_sort中删除", userLikeSort.getRelationId());
                                     continue;
                                 }
                                 toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
@@ -2238,6 +2246,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                             } else if (userLikeSort.getRelationType().equals(CollectionType.RELIGHT.getValue())) {
                                 ToProductImageResult toProductImageResult = toProductImageResultMapper.selectById(userLikeSort.getRelationId());
                                 if (isGenerateTaskFailed(toProductImageResult.getStatus(), toProductImageResult.getCreateTime())) {
+                                    failedSortIds.add(userLikeSort.getId());
+                                    log.info("【获取内容】RELIGHT结果失败，relationId={}，即将从collection_sort中删除", userLikeSort.getRelationId());
                                     continue;
                                 }
                                 toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
@@ -2269,6 +2279,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                             } else if (userLikeSort.getRelationType().equals(CollectionType.POSE_TRANSFORM.getValue())) {
                                 PoseTransformation item = poseTransformationMapper.selectById(userLikeSort.getRelationId());
                                 if (isGenerateTaskFailed(item.getTaskStatus(), item.getCreateTime())) {
+                                    failedSortIds.add(userLikeSort.getId());
+                                    log.info("【获取内容】POSE_TRANSFORM结果失败，relationId={}，即将从collection_sort中删除", userLikeSort.getRelationId());
                                     continue;
                                 }
                                 PoseTransformationVO poseTransformationVO = new PoseTransformationVO();
@@ -2293,6 +2305,114 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                 childList.add(poseTransformationVO);
                             }
                         }
+                        // 统一处理失败的记录：从collection_sort表中删除失败的记录，并重新排序
+                        if (CollectionUtil.isNotEmpty(failedSortIds)) {
+                            Long parentId = collectionSort.getId();
+                            Long projectId = projectDTO.getId();
+                            log.info("【获取内容】检测到{}条失败记录需要清理，parentId={}, projectId={}", failedSortIds.size(), parentId, projectId);
+                            for (Long failedSortId : failedSortIds) {
+                                CollectionSort failedRecord = collectionSortMapper.selectById(failedSortId);
+                                if (failedRecord != null) {
+                                    String relationType = failedRecord.getRelationType();
+                                    Long relationId = failedRecord.getRelationId();
+                                    collectionSortService.deleteCollectionSort(relationId, relationType, projectId, parentId);
+                                    log.info("【获取内容】已删除失败记录，relationId={}, relationType={}", relationId, relationType);
+                                }
+                            }
+                            // 重新查询子列表，获取更新后的排序
+                            childSortList = collectionSortMapper.selectList(childCollectionQw);
+                            // 重新构建childList，使用更新后的sort值
+                            childList = new ArrayList<>();
+                            for (CollectionSort userLikeSort : childSortList) {
+                                if (userLikeSort.getRelationType().equals(CollectionType.TO_PRODUCT_IMAGE.getValue())) {
+                                    ToProductImageResult toProductImageResult = toProductImageResultMapper.selectById(userLikeSort.getRelationId());
+                                    if (isGenerateTaskFailed(toProductImageResult.getStatus(), toProductImageResult.getCreateTime())) {
+                                        continue;
+                                    }
+                                    toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
+                                    ToProductImageResultVO toProductImageResultVO = CopyUtil.copyObject(toProductImageResult, ToProductImageResultVO.class);
+
+                                    ToProductImageRecord toProductImageRecord = toProductImageRecordMapper.selectById(toProductImageResult.getToProductImageRecordId());
+                                    if (Objects.isNull(toProductImageRecord)) {
+                                        continue;
+                                    }
+                                    toProductImageResultVO.setPrompt(toProductImageRecord.getPrompt());
+
+                                    if (toProductImageResultVO.getElementType().equals("ProductElement")) {
+                                        ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
+                                        toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl()));
+                                    } else if ((toProductImageResultVO.getElementType().equals("DesignOutfit"))) {
+                                        TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResultVO.getElementId());
+                                        toProductImageResultVO.setSourceUrl(getMinioUrl(tDesignPythonOutfit.getDesignUrl()));
+                                    } else {
+                                        ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResultVO.getElementId());
+                                        toProductImageResultVO.setSourceUrl(getMinioUrl(toProductImageResult1.getUrl()));
+                                    }
+                                    toProductImageResultVO.setCollectionType(CollectionType.TO_PRODUCT_IMAGE.getValue());
+                                    toProductImageResultVO.setSort(userLikeSort.getSort());
+                                    toProductImageResultVO.setUserLikeSortId(userLikeSort.getId());
+                                    toProductImageResultVO.setRelationType(userLikeSort.getRelationType());
+                                    toProductImageResultVO.setParentId(userLikeSort.getParentId());
+                                    childList.add(toProductImageResultVO);
+                                } else if (userLikeSort.getRelationType().equals(CollectionType.RELIGHT.getValue())) {
+                                    ToProductImageResult toProductImageResult = toProductImageResultMapper.selectById(userLikeSort.getRelationId());
+                                    if (isGenerateTaskFailed(toProductImageResult.getStatus(), toProductImageResult.getCreateTime())) {
+                                        continue;
+                                    }
+                                    toProductImageResult.setUrl(getMinioUrl(toProductImageResult.getUrl()));
+                                    ToProductImageResultVO toProductImageResultVO = CopyUtil.copyObject(toProductImageResult, ToProductImageResultVO.class);
+
+                                    ToProductImageRecord toProductImageRecord = toProductImageRecordMapper.selectById(toProductImageResult.getToProductImageRecordId());
+                                    if (Objects.isNull(toProductImageRecord)) {
+                                        continue;
+                                    }
+                                    toProductImageResultVO.setPrompt(toProductImageRecord.getPrompt());
+
+                                    if (toProductImageResultVO.getElementType().equals("ProductElement")) {
+                                        ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageResultVO.getElementId());
+                                        toProductImageResultVO.setSourceUrl(getMinioUrl(toProductElement.getUrl()));
+                                    } else if ((toProductImageResultVO.getElementType().equals("DesignOutfit"))) {
+                                        TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(toProductImageResultVO.getElementId());
+                                        toProductImageResultVO.setSourceUrl(getMinioUrl(tDesignPythonOutfit.getDesignUrl()));
+                                    } else {
+                                        ToProductImageResult toProductImageResult1 = toProductImageResultMapper.selectById(toProductImageResultVO.getElementId());
+                                        toProductImageResultVO.setSourceUrl(getMinioUrl(toProductImageResult1.getUrl()));
+                                    }
+                                    toProductImageResultVO.setCollectionType(CollectionType.RELIGHT.getValue());
+                                    toProductImageResultVO.setSort(userLikeSort.getSort());
+                                    toProductImageResultVO.setUserLikeSortId(userLikeSort.getId());
+                                    toProductImageResultVO.setRelationType(userLikeSort.getRelationType());
+                                    toProductImageResultVO.setParentId(userLikeSort.getParentId());
+                                    childList.add(toProductImageResultVO);
+                                } else if (userLikeSort.getRelationType().equals(CollectionType.POSE_TRANSFORM.getValue())) {
+                                    PoseTransformation item = poseTransformationMapper.selectById(userLikeSort.getRelationId());
+                                    if (isGenerateTaskFailed(item.getTaskStatus(), item.getCreateTime())) {
+                                        continue;
+                                    }
+                                    PoseTransformationVO poseTransformationVO = new PoseTransformationVO();
+                                    poseTransformationVO.setId(item.getId());
+                                    poseTransformationVO.setTaskId(item.getUniqueId());
+                                    poseTransformationVO.setProductImage(getMinioUrl(item.getProductImage()));
+                                    poseTransformationVO.setLastFrameProductImage(getMinioUrl(item.getLastFrameProductImage()));
+                                    poseTransformationVO.setPrompt(item.getPrompt());
+                                    poseTransformationVO.setGifUrl(getMinioUrl(item.getGifUrl()));
+                                    poseTransformationVO.setVideoUrl(getMinioUrl(item.getVideoUrl()));
+                                    poseTransformationVO.setFirstFrameUrl(getMinioUrl(item.getFirstFrameUrl()));
+                                    poseTransformationVO.setIsLiked(item.getIsLiked());
+                                    poseTransformationVO.setCollectionType(CollectionType.POSE_TRANSFORM.getValue());
+                                    poseTransformationVO.setSort(userLikeSort.getSort());
+                                    poseTransformationVO.setUserLikeSortId(userLikeSort.getId());
+                                    poseTransformationVO.setRelationType(userLikeSort.getRelationType());
+                                    poseTransformationVO.setResultType(CollectionType.POSE_TRANSFORM.getValue());
+                                    poseTransformationVO.setParentId(userLikeSort.getParentId());
+                                    poseTransformationVO.setModelName(item.getModelName());
+                                    poseTransformationVO.setPoseId(item.getPoseId());
+                                    poseTransformationVO.setStatus(item.getTaskStatus());
+                                    childList.add(poseTransformationVO);
+                                }
+                            }
+                            log.info("【获取内容】失败记录清理完成，重新排序后childList.size={}", childList.size());
+                        }
                         o.setChildList(childList);
 
                         list.add(o);