aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:用户订阅后，订阅者和商家无法收到通知邮件

Browse Source
This commit is contained in:
xupei
2025-10-22 10:48:29 +08:00
parent 1af705592a
commit e825c9bd75
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/service/impl/AffiliateServiceImpl.java
View File

@@ -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);
}

8
src/main/java/com/ai/da/service/impl/ConvenientInquiryServiceImpl.java
View File

@@ -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());
}
// 查询数据总量

5
src/main/java/com/ai/da/service/impl/StripeServiceImpl.java
View File

@@ -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);