Merge branch 'release/3.1' into dev/3.1_release_merge

src/main/java/com/ai/da/common/config/MyTaskScheduler.java

@@ -202,7 +202,7 @@ public class MyTaskScheduler {
         }
     }
 
-//    @Scheduled(cron = "0 0 9 * * ?")
+    //    @Scheduled(cron = "0 0 9 * * ?")
     public void sendTrialOrderExcelToManagements() {
         // 获取前一天日期
         LocalDate yesterday = LocalDate.now().minusDays(1);

src/main/java/com/ai/da/common/constant/ModelConstants.java

@@ -20,7 +20,7 @@ public class ModelConstants {
     public static final String PRINTBOARD_ADVANCED_T2I = "qwen-image";
     public static final String MOODBOARD_ADVANCED = "doubao-seedream-3-0-t2i-250415";
     public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-3-0-t2i-250415";
-    public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828";
+    public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828-fast";
     public static final String PRINTBOARD_ADVANCED_I2I = "doubao-seedream-4-0-250828";
     public static final String IMAGEN_MODEL = "imagen-4.0-generate-001";
     public static final String NANO_BANANA = "gemini-2.5-flash-image";

src/main/java/com/ai/da/common/task/AccountTask.java

@@ -34,7 +34,7 @@ public class AccountTask {
         accountService.refreshCreditsMonthly();
     }
 
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    //    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void getPaidUser() {
         // 获取code-create 表中 指定日期之后 订单状态为wc-processing的订单
         accountService.extendValidityForCC();

src/main/java/com/ai/da/common/task/PaymentTask.java

@@ -45,7 +45,7 @@ public class PaymentTask {
     @Resource
     private PayPalCheckoutService payPalCheckoutService;
 
-//    @Scheduled(cron = "0/30 * * * * ?")
+    //    @Scheduled(cron = "0/30 * * * * ?")
     public void orderConfirmForPaypal() throws SerializeException {
 
 //        log.info("PayPal orderConfirm 被执行......");
@@ -97,7 +97,7 @@ public class PaymentTask {
         //
     }
 
-//    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
+    //    @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes
     public void updateAffiliateInfoWithPayment(){
 //        log.info("佣金计算定时器");
         affiliateService.updateAffiliateInfoWithPayment();
@@ -109,7 +109,7 @@ public class PaymentTask {
         affiliateService.syncLinkViewCountToDB();
     }
 
-//    @Scheduled(cron = "0 0 8 28-31 * ?")
+    //    @Scheduled(cron = "0 0 8 28-31 * ?")
     public void commissionSummaryReminder(){
         // 每个月末的最后一天的早上八点执行
         LocalDate today = LocalDate.now();

src/main/java/com/ai/da/common/task/SubscriptionReminderTask.java

@@ -40,7 +40,7 @@ public class SubscriptionReminderTask {
         REMINDER_DAYS_CONFIG.put("year", 14);
     }
 
-//    @Scheduled(cron = "0 0 9 * * ?")
+    //    @Scheduled(cron = "0 0 9 * * ?")
     public void subscriptionReminder() {
         // 获取所有需要通知的订阅
         List<SubscriptionInfo> subscriptionInfos = getDueSubscriptions();
@@ -97,7 +97,7 @@ public class SubscriptionReminderTask {
         return subscriptionInfoMapper.selectList(qw);
     }
 
-//    @Scheduled(cron = "0 0 9 * * ?")
+    //    @Scheduled(cron = "0 0 9 * * ?")
     public void trialReminder() {
         // 今天的 00:00:00 和 23:59:59
         LocalDateTime startOfDay = LocalDateTime.now().toLocalDate().atStartOfDay();

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

@@ -521,6 +521,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
                     .map(DesignCollectionPrintElementDTO::getId)
                     .collect(Collectors.toList());
             List<CollectionElement> printBoardElements = new ArrayList<>();
+            elementVO.setPrintBoardElements(printBoardElements);
             if (!CollectionUtils.isEmpty(printBoardIds)) {
                 // 从数据库批量查询printBoard元素
                 printBoardElements = collectionElementMapper.selectBatchIds(printBoardIds);
@@ -528,7 +529,7 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
                 if (CollectionUtil.isEmpty(printBoardElements) || printBoardElements.size() != printBoardIds.size()) {
                     throw new BusinessException("get.printBoards.data.is.mismatch");
                 }
-                elementVO.setPrintBoardElements(printBoardElements);
+//                elementVO.setPrintBoardElements(printBoardElements);
                 usedElementIds.addAll(printBoardIds); // 记录已使用的元素ID
             }
             // 处理类型为LIBRARY的printBoard元素

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

@@ -764,7 +764,20 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
                 getPrintboardLevel2TypeQw.lambda().orderByDesc(CollectionElement::getCreateDate);
                 getPrintboardLevel2TypeQw.last("limit 1");
                 CollectionElement one = collectionElementService.getOne(getPrintboardLevel2TypeQw);
+                if (Objects.isNull(one)) {
+                    QueryWrapper<Library> libraryQueryWrapper = new QueryWrapper<>();
+                    libraryQueryWrapper.lambda().eq(Library::getUrl, print.getPath());
+                    libraryQueryWrapper.lambda().orderByDesc(Library::getCreateDate);
+                    getPrintboardLevel2TypeQw.last("limit 1");
+                    Library library = libraryService.getOne(libraryQueryWrapper);
+                    if (Objects.isNull(library)) {
+                        print.setLevel2Type("Pattern");
+                    } else {
+                        print.setLevel2Type(library.getLevel2Type());
+                    }
+                } else {
                     print.setLevel2Type(one.getLevel2Type());
+                }
                 print.setCreateDate(LocalDateTime.now());
                 designItemDetailPrintService.save(print);
             }

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

@@ -198,9 +198,12 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         generate.setText(text);
         Long elementId = generateThroughImageTextDTO.getCollectionElementId();
 //        validateGeneraType(generate, text, elementId);
+        if (!(generateThroughImageTextDTO.getLevel1Type().equals(MOOD_BOARD.getRealName())&&generateThroughImageTextDTO.getModelName().equals("high"))){
             if (!StringUtil.isNullOrEmpty(text)) {
                 text = modifyPrompt(text, generate, generateThroughImageTextDTO.getLevel1Type(), generateThroughImageTextDTO.getAgeGroup());
             }
+        }
+
 
         // todo 这一步现在还是有必要的吗？
         // 2.1 sketch或print在t_collection_element表/t_library表中的信息是否需要更新 如 level2Type
@@ -1554,6 +1557,8 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
                     GenerateImagesRequest.OptimizePromptOptions optimizePromptOptions = new GenerateImagesRequest.OptimizePromptOptions();
                     optimizePromptOptions.setMode("fast");
                     requestBuilder.optimizePromptOptions(optimizePromptOptions);
+                    //由于PRINTBOARD_HIGH_I2I与PRINTBOARD_ADVANCED_I2I使用模型一致，为了区别积分扣除，PRINTBOARD_HIGH_I2I加入了-fast，但传入模型时需要去掉-fast，用PRINTBOARD_ADVANCED_I2I的常量做替代
+                    requestBuilder.model(ModelConstants.PRINTBOARD_ADVANCED_I2I);
                 }
 
                 // 保存生成记录到数据库

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);
+                    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);
+                    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()));
@@ -2250,6 +2260,114 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                 }
                                 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())) {
+                                    failedSortIds.add(userLikeSort.getId());
+                                    log.info("【获取内容】POSE_TRANSFORM结果失败，relationId={}，即将从collection_sort中删除", userLikeSort.getRelationId());
+                                    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);
+                            }
+                        }
+                        // 统一处理失败的记录：从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()));
@@ -2293,6 +2411,8 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                                     childList.add(poseTransformationVO);
                                 }
                             }
+                            log.info("【获取内容】失败记录清理完成，重新排序后childList.size={}", childList.size());
+                        }
                         o.setChildList(childList);
 
                         list.add(o);