2 Revize b787d96a78 ... d5a20e51f3

Autor SHA1 Zpráva Datum
  tangxiangan d5a20e51f3 Merge remote-tracking branch 'origin/develop/v1.0' into develop/v1.0 před 4 dny
  tangxiangan 24b898ddc9 Bug修复 před 4 dny

+ 1 - 1
pdf-office-payment/src/main/java/cn/kdan/cloud/pdf/office/payment/service/impl/AppStoreServiceImpl.java

@@ -87,7 +87,7 @@ public class AppStoreServiceImpl implements AppStoreService {
             result.setDigestPassword(null);
             return result;
         }
-        log.info("appStore 权益校验,用户id:{}",equityVerificationDTO.getUserId());
+        log.info("appStore 权益校验,用户id:{},请求体:{}",equityVerificationDTO.getUserId(),equityVerificationDTO);
         AppTransaction appTransaction = this.appStoreReceiptVerify(equityVerificationDTO.getTransactionId(),equityVerificationDTO.getApplePayProductId(),equityVerificationDTO.getAppBundleId());
         // 获取票据订单信息
         String transactionId = appTransaction.getTransactionId();

+ 2 - 1
pdf-office-sso/src/main/java/cn/kdan/cloud/pdf/office/sso/service/impl/AuthServiceImpl.java

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