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

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

Browse Source
This commit is contained in:
xupei
2025-11-28 13:41:35 +08:00
parent b58b8df88f b6add404b3
commit e366d5a2c5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2572,6 +2572,11 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
throw new BusinessException("Access denied. Insufficient permissions."); throw new BusinessException("Access denied. Insufficient permissions.");
} }
// 判断当前账号的有效期是否与管理员同步
if (exAccountInfo.getValidEndTime() < adminAcc.getValidEndTime()){
exAccountInfo.setValidEndTime(adminAcc.getValidEndTime());
}
// 校验用户名是否同名 // 校验用户名是否同名
if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserName()) if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserName())
&& !exAccountInfo.getUserName().equals(addSubAccountDTO.getUserName()) && !exAccountInfo.getUserName().equals(addSubAccountDTO.getUserName())

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

@@ -167,6 +167,7 @@ public class StripeServiceImpl implements StripeService {
String orderId = orderInfo.getOrderNo(); String orderId = orderInfo.getOrderNo();
// Alipay - Not supported when using Checkout in subscription mode or setup mode.
if (payType.equals("recurring")){ if (payType.equals("recurring")){
sessionBuilder.setMode(SessionCreateParams.Mode.SUBSCRIPTION); sessionBuilder.setMode(SessionCreateParams.Mode.SUBSCRIPTION);
sessionBuilder.setSubscriptionData(SessionCreateParams.SubscriptionData.builder().setDescription("AiDA - " + orderId).build()); sessionBuilder.setSubscriptionData(SessionCreateParams.SubscriptionData.builder().setDescription("AiDA - " + orderId).build());