fix 奈飞检测状态判断

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

@@ -1353,9 +1353,11 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	@Override
 	public NetflixErrorAccountStatus getNetflixErrorAccountStatus(long userId, Long relationId) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		GroupsRelation relation = groupsRelationMapper.selectById(relationId);
 		NetflixUserAccountStatusRecord netflixUseAccountStatusRecord = netflixUserAccountStatusRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUserAccountStatusRecord.class)
 				.eq(NetflixUserAccountStatusRecord::getRelationId, relationId)
 				.eq(NetflixUserAccountStatusRecord::getDeleted, 1)
+				.gt(NetflixUserAccountStatusRecord::getCreatedTime, relation.getStartTime())
 				.in(NetflixUserAccountStatusRecord::getUserId, userIdList)
 				.orderByDesc(NetflixUserAccountStatusRecord::getId)
 				.last("limit 1"));
@@ -1385,7 +1387,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		//未异常
 		if (state != 3) {
 			//车队是否已下架
-			GroupsRelation relation = groupsRelationMapper.selectById(relationId);
 			GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
 			GoodsDonSku sku = goodsDonSkuMapper.selectById(groupsTrips.getSkuId());
 			if (groupsTrips != null && sku.getDays() == null && groupsTrips.getStatus() == GroupsTrips.Status.down) {
@@ -2636,9 +2637,18 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 	 */
 	public GroupsRelationView checkNetflixErrorStatus(Long relationId, Long userId) {
 		List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
+		GroupsRelationView netflixRelationView = beanSearcher.searchFirst(GroupsRelationView.class, MapUtils.builder()
+				.field(GroupsRelationView::getId, relationId)
+				.field(GroupsRelationView::getUserId, userIdList).op(Operator.InList)
+				.field(GroupsRelationView::getGoodsId, Constant.NETFLIX_GID)
+				.build());
+		if (netflixRelationView == null) {
+			throw BusinessRuntimeException.getInstance("奈飞车票已过期");
+		}
 		NetflixUserAccountStatusRecord netflixUseAccountStatusRecord = netflixUserAccountStatusRecordMapper.selectOne(Wrappers.lambdaQuery(NetflixUserAccountStatusRecord.class)
 				.eq(NetflixUserAccountStatusRecord::getRelationId, relationId)
 				.eq(NetflixUserAccountStatusRecord::getDeleted, 1)
+				.gt(NetflixUserAccountStatusRecord::getCreatedTime, netflixRelationView.getStartTime())
 				.in(NetflixUserAccountStatusRecord::getUserId, userIdList)
 				.orderByDesc(NetflixUserAccountStatusRecord::getId)
 				.last("limit 1"));
@@ -2653,14 +2663,6 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 		if (state != 3) {
 			throw BusinessRuntimeException.getInstance("您的账号未封禁");
 		}
-		GroupsRelationView netflixRelationView = beanSearcher.searchFirst(GroupsRelationView.class, MapUtils.builder()
-				.field(GroupsRelationView::getId, relationId)
-				.field(GroupsRelationView::getUserId, userIdList).op(Operator.InList)
-				.field(GroupsRelationView::getGoodsId, Constant.NETFLIX_GID)
-				.build());
-		if (netflixRelationView == null) {
-			throw BusinessRuntimeException.getInstance("奈飞车票已过期");
-		}
 		if (netflixRelationView != null) {
 			if (netflixRelationView.getIsFrozen() && netflixRelationView.getUnfrozenTime().after(DateTime.now())) {
 				throw BusinessRuntimeException.getInstance("冻结未结束");