diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index 09286981..4a9e4a49 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -2572,6 +2572,11 @@ public class AccountServiceImpl extends ServiceImpl impl throw new BusinessException("Access denied. Insufficient permissions."); } + // 判断当前账号的有效期是否与管理员同步 + if (exAccountInfo.getValidEndTime() < adminAcc.getValidEndTime()){ + exAccountInfo.setValidEndTime(adminAcc.getValidEndTime()); + } + // 校验用户名是否同名 if (!StringUtil.isNullOrEmpty(addSubAccountDTO.getUserName()) && !exAccountInfo.getUserName().equals(addSubAccountDTO.getUserName()) 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 373942e0..47a2bf36 100644 --- a/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/StripeServiceImpl.java @@ -167,6 +167,7 @@ public class StripeServiceImpl implements StripeService { String orderId = orderInfo.getOrderNo(); + // Alipay - Not supported when using Checkout in subscription mode or setup mode. if (payType.equals("recurring")){ sessionBuilder.setMode(SessionCreateParams.Mode.SUBSCRIPTION); sessionBuilder.setSubscriptionData(SessionCreateParams.SubscriptionData.builder().setDescription("AiDA - " + orderId).build());