zoujiajian 1 rok temu
rodzic
commit
43f105c115

+ 17 - 6
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -1211,16 +1211,19 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		if (accountNetflixState != null && accountNetflixState.getState() == 3) {
 			state = accountNetflixState.getState();
 		}
+		//非正常状态
+		if (state != 1) {
+			//20号之前得校验 直接失败
+			if (renewalView.getCreatedTime().compareTo(DateUtil.parse("2025-06-20")) < 0) {
+				state = 3;
+			}
+		}
 		NetflixUserAccountStatusRecord netflixUserAccountStatusRecord = new NetflixUserAccountStatusRecord();
 		netflixUserAccountStatusRecord.setAccount(account);
 		netflixUserAccountStatusRecord.setRelationId(relationId);
 		netflixUserAccountStatusRecord.setPassword(password);
 		netflixUserAccountStatusRecord.setUserId(renewalView.getUserId());
 		netflixUserAccountStatusRecord.setState(state);
-		//20号之前得校验 直接失败
-		if (renewalView.getCreatedTime().compareTo(DateUtil.parse("2025-06-20")) < 0) {
-			netflixUserAccountStatusRecord.setState(3);
-		}
 		OrderDon orderDon = orderDonMapper.selectOne(Wrappers.lambdaQuery(OrderDon.class)
 				.eq(OrderDon::getRelationId, renewalView.getRelationId())
 				.in(OrderDon::getUserId, userIdList)
@@ -1241,8 +1244,17 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 				.eq(NetflixUserAccountStatusRecord::getDeleted, 1)
 				.in(NetflixUserAccountStatusRecord::getUserId, userIdList)
 				.last("limit 1"));
+		NetflixErrorAccountStatus status = new NetflixErrorAccountStatus();
 		if (netflixUseAccountStatusRecord == null) {
-			return null;
+			//是否已经更换
+			NetflixUserAccountSubmitRecoverRecord replaceRecover = netflixUserAccountSubmitRecoverRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUserAccountSubmitRecoverRecord.class)
+					.eq(NetflixUserAccountSubmitRecoverRecord::getUserId, userIdList)
+					.eq(NetflixUserAccountSubmitRecoverRecord::getReplaceRelationId, relationId)
+					.last("limit 1"));
+			if (replaceRecover != null) {
+				status.setRecoverStatus(replaceRecover.getStatus());
+			}
+			return status;
 		}
 		Integer state = netflixUseAccountStatusRecord.getState();
 		//2是登录失败 3是被封号
@@ -1255,7 +1267,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		if (state == 2) {
 			state = 1;
 		}
-		NetflixErrorAccountStatus status = new NetflixErrorAccountStatus();
 		//账号检测状态
 		status.setNfStatus(state);
 		NetflixUserAccountSubmitRecoverRecord recoverRecord = netflixUserAccountSubmitRecoverRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUserAccountSubmitRecoverRecord.class)