Merge branch 'zx_online_tenantAlbum_0331' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserTenantAlbumRecordServiceImpl.java

@@ -914,6 +914,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
         List<UserTenantAlbumRecord> albumRecords = this.lambdaQuery()
                 .eq(UserTenantAlbumRecord::getUserId, userId)
                 .eq(UserTenantAlbumRecord::getEfficientFlag, true)
+                .eq(UserTenantAlbumRecord::getDeductionStatus, EDeductionStatus.EFFECTIVE)
                 .eq(albumId != null, UserTenantAlbumRecord::getTenantAlbumId, albumId).list();
         UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord lastUserTenantAlbumRecord = new UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord();
         Long tenantAlbumId = null;
@@ -932,7 +933,8 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
             //获取最近一条记录已过期的记录
             UserTenantAlbumRecord record = this.lambdaQuery()
                     .eq(UserTenantAlbumRecord::getUserId, userId)
-                    .eq(UserTenantAlbumRecord::getEfficientFlag, false)
+                    .eq(UserTenantAlbumRecord::getEfficientFlag, true)
+                    .lt(UserTenantAlbumRecord::getEndTime, new Date())
                     .eq(albumId != null, UserTenantAlbumRecord::getTenantAlbumId, albumId)
                     .orderByDesc(UserTenantAlbumRecord::getEndTime)
                     .orderByAsc(UserTenantAlbumRecord::getId)