获取最近过期的专辑

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/UserTenantAlbumRecordController.java

@@ -135,7 +135,7 @@ public class UserTenantAlbumRecordController {
 
     @ApiOperation(value = "获取最近一次购买记录")
     @GetMapping("/lastRecord")
-    public R<UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord> last() {
-        return R.from(userTenantAlbumRecordService.last(sysUserService.getUserId(),null));
+    public HttpResponseResult<UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord> last() {
+        return HttpResponseResult.succeed(userTenantAlbumRecordService.last(sysUserService.getUserId(),null));
     }
 }

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

@@ -941,7 +941,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
             }
         }
         if (tenantAlbumId != null){
-            if (albumId != null){
+            if (albumId == null){
                 TenantAlbum tenantAlbum = tenantAlbumService.getById(tenantAlbumId);
                 lastUserTenantAlbumRecord.setTenantAlbumName(tenantAlbum.getName());
             }