From 5d3692a2049a568f0a1730edb1b527796f26d33e Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 8 Apr 2026 13:52:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BUGFIX:=E6=94=AF=E4=BB=98=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF=EF=BC=88=E4=B8=B4=E6=97=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ai/da/service/impl/StripeServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
index ea3c758c..d297b159 100644
--- a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
+++ b/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);

From 9bd10581f41bcb6296fcaec0fd6b5365c98d7aec Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Fri, 10 Apr 2026 23:03:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BUGFIX=EF=BC=9A=E8=8E=B7=E5=8F=96relight?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=97=B6=E5=88=A0=E9=99=A4=E4=BA=86=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ai/da/service/impl/UserLikeGroupServiceImpl.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 47e8b587..281c45d9 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -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()));