Merge branch 'feature/0721-tenant' into develop

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

@@ -1886,15 +1886,15 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             albumIds = albumList.stream().map(TenantAlbum::getId).distinct().collect(Collectors.toList());
         }
 
-        List<UserTenantAlbumRecord> recordList = userTenantAlbumRecordService
-                .getNewestByTenantIdAndUserId(student.getTenantId(), queryInfo.getUserId(), ClientEnum.STUDENT, albumIds);
-
-        if (CollectionUtils.isNotEmpty(recordList)) {
-            albumIds = recordList.stream().map(UserTenantAlbumRecord::getTenantAlbumId).distinct().collect(Collectors.toList());
-            queryInfo.setTenantAlbumIds(albumIds);
-        } else {
-            return searchData;
-        }
+//        List<UserTenantAlbumRecord> recordList = userTenantAlbumRecordService
+//                .getNewestByTenantIdAndUserId(student.getTenantId(), queryInfo.getUserId(), ClientEnum.STUDENT, albumIds);
+//
+//        if (CollectionUtils.isNotEmpty(recordList)) {
+//            albumIds = recordList.stream().map(UserTenantAlbumRecord::getTenantAlbumId).distinct().collect(Collectors.toList());
+//        } else {
+//            return searchData;
+//        }
+        queryInfo.setTenantAlbumIds(albumIds);
 
         // 查询曲目列表
         List<Long> musicIds = musicSheetDao.searchMusic(PageUtil.getPage(queryInfo),queryInfo);

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

@@ -176,7 +176,7 @@ public class UserPaymentOrderServiceImpl  implements UserPaymentOrderService {
             throw new BizException("支付方式不支持");
         }
 
-        UserOrderPayment newestPayment = userOrderPaymentService.getNewestPayment(order.getTransNo(), order1.getOrderNo());
+        UserOrderPayment newestPayment = userOrderPaymentService.getNewestPayment(null, order1.getOrderNo());
         if (newestPayment == null) {
             newestPayment = new UserOrderPayment();
         }