Merge branch 'feature/0124' into develop-new

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

@@ -258,6 +258,12 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                     log.error("订单创建前检测，学生购买机构专辑，机构小组专辑不存在，userId={},tenantGroupAlbumId={}", orderGoodsInfo.getUserId(), orderGoodsInfo.getTenantGroupAlbumId());
                     throw new BizException("小组专辑不存在");
                 }
+
+                // 判断学生是否在小组
+                if (orderGoodsInfo.getTenantGroupAlbumId().equals(student.getTenantGroupId())) {
+                    log.error("订单创建前检测，学生购买机构专辑，学生不在小组，userId={},tenantGroupAlbumId={}", orderGoodsInfo.getUserId(), orderGoodsInfo.getTenantGroupAlbumId());
+                    throw new BizException("学生不在小组");
+                }
                 if (!tenantGroupAlbum.getTenantAlbumId().equals(orderGoodsInfo.getBizId())) {
                     log.error("订单创建前检测，学生购买机构专辑，机构小组专辑ID和当前机构专辑ID不对应，userId={},tenantGroupAlbumId={},bizId={}", orderGoodsInfo.getUserId(), orderGoodsInfo.getTenantGroupAlbumId(), orderGoodsInfo.getBizId());
                     throw new BizException("小组专辑和当前购买专辑不对应");