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

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

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

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

@@ -96,5 +96,5 @@ public interface UserTenantAlbumRecordService extends IService<UserTenantAlbumRe
 
     List<UserTenantAlbumRecordWrapper.Info> info(UserTenantAlbumRecordWrapper.InfoQuery infoQuery);
 
-    UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord last(Long userId, Long tenantAlbumId);
+    UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord last(Long userId,Long tenantId, Long tenantAlbumId);
 }

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

@@ -224,7 +224,7 @@ public class TenantGroupAlbumServiceImpl extends ServiceImpl<TenantGroupAlbumMap
                     item.setExpireTime(userTenantAlbumRecord.getEndTime());
                 }
                 item.setSort(sortMap.getOrDefault(item.getId(),0L));
-                UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord albumRecord = userTenantAlbumRecordService.last(query.getUserId(), item.getId());
+                UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord albumRecord = userTenantAlbumRecordService.last(query.getUserId(),query.getTenantId(), item.getId());
                 if (albumRecord != null) {
                     item.setEndTime(albumRecord.getEndTime());
                 }

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

@@ -909,10 +909,11 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
     }
 
     @Override
-    public UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord last(Long userId,Long albumId) {
+    public UserTenantAlbumRecordWrapper.LastUserTenantAlbumRecord last(Long userId,Long tenantId,Long albumId) {
         //获取最近有效期最近的一条记录，（没过期）
         List<UserTenantAlbumRecord> albumRecords = this.lambdaQuery()
                 .eq(UserTenantAlbumRecord::getUserId, userId)
+                .eq(UserTenantAlbumRecord::getTenantId, tenantId)
                 .eq(UserTenantAlbumRecord::getEfficientFlag, true)
                 .eq(UserTenantAlbumRecord::getDeductionStatus, EDeductionStatus.EFFECTIVE)
                 .eq(albumId != null, UserTenantAlbumRecord::getTenantAlbumId, albumId).list();
@@ -934,6 +935,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
             UserTenantAlbumRecord record = this.lambdaQuery()
                     .eq(UserTenantAlbumRecord::getUserId, userId)
                     .eq(UserTenantAlbumRecord::getEfficientFlag, true)
+                    .eq(UserTenantAlbumRecord::getTenantId, tenantId)
                     .lt(UserTenantAlbumRecord::getEndTime, new Date())
                     .eq(albumId != null, UserTenantAlbumRecord::getTenantAlbumId, albumId)
                     .orderByDesc(UserTenantAlbumRecord::getEndTime)
@@ -949,6 +951,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
             if (albumId == null){
                 TenantAlbum tenantAlbum = tenantAlbumService.getById(tenantAlbumId);
                 lastUserTenantAlbumRecord.setTenantAlbumName(tenantAlbum.getName());
+                lastUserTenantAlbumRecord.setTenantAlbumId(tenantAlbumId);
             }
             lastUserTenantAlbumRecord.setEndTime(endTime);
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/UserTenantAlbumRecordWrapper.java

@@ -282,6 +282,9 @@ public class UserTenantAlbumRecordWrapper {
     @Data
     public static class LastUserTenantAlbumRecord {
 
+        @ApiModelProperty("机构专辑编号")
+        private Long tenantAlbumId;
+
         @ApiModelProperty("机构专辑名称")
         private String tenantAlbumName;