|
@@ -273,9 +273,8 @@ public class AuthServiceImpl implements AuthService {
|
|
public Boolean judgeActiveSubscription(List<UserSubscriptionInfoVO> subscriptionInfoList) {
|
|
public Boolean judgeActiveSubscription(List<UserSubscriptionInfoVO> subscriptionInfoList) {
|
|
// 过滤掉isAi为true的记录
|
|
// 过滤掉isAi为true的记录
|
|
List<UserSubscriptionInfoVO> filteredList = subscriptionInfoList.stream()
|
|
List<UserSubscriptionInfoVO> filteredList = subscriptionInfoList.stream()
|
|
- .filter(info -> info.getStatus() == 1 // 筛选出 status = 1 的记录
|
|
|
|
- && info.getPaymentModel().equals("1")
|
|
|
|
- &&ObjectUtils.isEmpty(info.getIsAi())||ValidStatusEnum.INVALID.value().equals(info.getIsAi())) // 筛选出 paymentModel = 1 的记录
|
|
|
|
|
|
+ .filter(info -> info.getStatus() == 1) // 筛选 status = 1
|
|
|
|
+ .filter(info -> info.getPlatform()==2 && info.getAppId().equals("1")) // 筛选 paymentModel = "1"// 筛选 isAi 为空
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
if (CollectionUtils.isEmpty(filteredList)){
|
|
if (CollectionUtils.isEmpty(filteredList)){
|
|
return false;
|
|
return false;
|