From e825c9bd752128058da52aba76829629e67007a7 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 22 Oct 2025 10:48:29 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E7=94=A8=E6=88=B7=E8=AE=A2=E9=98=85?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=AE=A2=E9=98=85=E8=80=85=E5=92=8C=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E6=97=A0=E6=B3=95=E6=94=B6=E5=88=B0=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ai/da/service/impl/AffiliateServiceImpl.java | 2 +-
 .../ai/da/service/impl/ConvenientInquiryServiceImpl.java  | 8 ++------
 .../java/com/ai/da/service/impl/StripeServiceImpl.java    | 5 +++--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
index 8d535cbf..551f86a2 100644
--- a/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
@@ -173,7 +173,7 @@ public class AffiliateServiceImpl extends ServiceImpl<AffiliateMapper, Affiliate
             affiliate.setLink(CommonConstant.AFFILIATE_LINK + affiliate.getId());
             if (Objects.isNull(commission)) {
                 // 未设置佣金比例的情况下，默认25%
-                affiliate.setCommissionPercent(25f);
+                affiliate.setCommissionPercent(20f);
             } else {
                 affiliate.setCommissionPercent(commission);
             }
diff --git a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
index 63acfb1d..3381c369 100644
--- a/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
@@ -827,9 +827,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
         Long accountId = UserContext.getUserHolder().getId();
         Account account = accountService.getById(accountId);
         // 允许查看数据的用户id
-        if (!ADMIN_IDS.contains(account.getId())
-                && !ADMIN_IDS_READ_ONLY.contains(account.getId())
-        ) {
+        if (!ADMIN_IDS.contains(account.getId())) {
             throw new BusinessException("have.no.permission", ResultEnum.PROMPT.getCode());
         }
         Integer size = queryPaymentInfoDTO.getSize();
@@ -896,9 +894,7 @@ public class ConvenientInquiryServiceImpl extends ServiceImpl<QuestionnaireMappe
         Long accountId = UserContext.getUserHolder().getId();
         Account account = accountService.getById(accountId);
         // 允许查看数据的用户id
-        if (!ADMIN_IDS.contains(account.getId())
-                && !ADMIN_IDS_READ_ONLY.contains(account.getId())
-        ) {
+        if (!ADMIN_IDS.contains(account.getId())) {
             throw new BusinessException("have.no.permission", ResultEnum.PROMPT.getCode());
         }
         // 查询数据总量
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 c8e63e62..a4c133ff 100644
--- a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
@@ -1010,6 +1010,7 @@ public class StripeServiceImpl implements StripeService {
     public boolean sendEmail(String subscriptionId, String type, String orderNo) {
         SubscriptionInfo subscriptionInfo;
         long secondsTimestamp = System.currentTimeMillis() / 1000;
+        log.info("当前时间戳：{}", secondsTimestamp);
         QueryWrapper<SubscriptionInfo> qwSI = new QueryWrapper<>();
         if (!StringUtil.isNullOrEmpty(subscriptionId)) {
             // 区分当前订阅的时段，从而确定是新订单还是续订订单的记录
@@ -1036,8 +1037,8 @@ public class StripeServiceImpl implements StripeService {
             }
         }else if (!StringUtil.isNullOrEmpty(orderNo)) {
             qwSI.lambda().eq(SubscriptionInfo::getOrderNo, orderNo)
-                    .gt(SubscriptionInfo::getCurrentPeriodStart, secondsTimestamp)
-                    .lt(SubscriptionInfo::getCurrentPeriodEnd, secondsTimestamp);
+                    .lt(SubscriptionInfo::getCurrentPeriodStart, secondsTimestamp)
+                    .gt(SubscriptionInfo::getCurrentPeriodEnd, secondsTimestamp);
             subscriptionInfo = subscriptionInfoMapper.selectOne(qwSI);
             if (Objects.isNull(subscriptionInfo)){
                 log.info("不发送邮件，原因：【根据order_no：{}，查询到的subscriptionInfo为空】", orderNo);