Merge branch 'feature/0721-tenant' of E:\cooleshow\code with conflicts.

cooleshow-auth/auth-api/pom.xml

@@ -33,5 +33,23 @@
 			<groupId>com.yonge.cooleshow</groupId>
 			<artifactId>cooleshow-common</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.yonge.cooleshow</groupId>
+			<artifactId>cooleshow-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-openfeign-core</artifactId>
+			<version>2.1.1.RELEASE</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.yonge.toolset</groupId>
+			<artifactId>utils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.yonge.toolset</groupId>
+			<artifactId>utils</artifactId>
+		</dependency>
 	</dependencies>
 </project>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -0,0 +1,144 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.admin.io.request.TenantAlbumVo;
+import com.yonge.cooleshow.api.feign.dto.TenantWrapper;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.*;
+import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
+import com.yonge.cooleshow.biz.dal.service.TenantAlbumMusicService;
+import com.yonge.cooleshow.biz.dal.service.TenantAlbumRefService;
+import com.yonge.cooleshow.biz.dal.service.TenantAlbumService;
+import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.exception.BizException;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+/**
+ * @Author：haonan
+ * @Date：2023/7/27 18:26
+ * @Filename：TenantAlbumController
+ */
+
+@RestController
+@RequestMapping("/tenantAlbum")
+@Api(value = "机构管理", tags = "机构管理")
+public class TenantAlbumController {
+    @Autowired
+    TenantAlbumService tenantAlbumService;
+
+    @Autowired
+    private TenantAlbumMusicService tenantAlbumMusicService;
+
+    @Autowired
+    private TenantAlbumRefService tenantAlbumRefService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private TenantInfoService tenantInfoService;
+
+    /**
+     * 查询分页
+     *
+     * @param query
+     */
+    @PostMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "tenantAlbum")
+    //@PreAuthorize("@pcs.hasPermissions('tenantAlbum/page')")
+    public HttpResponseResult<PageInfo<TenantAlbumWrapper.TenantAlbum>> page(@RequestBody TenantAlbumWrapper.TenantAlbumQuery query) {
+
+        IPage<TenantAlbumWrapper.TenantAlbum> pages = tenantAlbumService.selectPage(PageUtil.getPage(query), query);
+        return HttpResponseResult.succeed(PageUtil.pageInfo(pages));
+    }
+
+
+
+    /**
+     * 查询详情
+     * @param query 详情ID
+     * @return TenantAlbum
+     */
+    @PostMapping("/detail")
+    @ApiOperation(value = "查询详情", notes = "detail")
+    //@PreAuthorize("@pcs.hasPermissions('tenantAlbum/detail')")
+    public HttpResponseResult<TenantAlbumVo.TenantAlbum> detail(@RequestBody TenantAlbumVo.TenantAlbum query) {
+
+        TenantAlbumVo.TenantAlbum vo = new TenantAlbumVo.TenantAlbum();
+        Long id = query.getId();
+        TenantAlbum tenantAlbum= tenantAlbumService.detail(id);
+        //查关联表
+        TenantAlbumRef ref = tenantAlbumRefService.getBytenantAlbumId(id);
+        vo.setTenantId(ref.getTenantId());
+        //查询机构专辑表
+        vo.setName(tenantAlbum.getName());
+        vo.setDescribe(tenantAlbum.getDescribe());
+        vo.setCoverImg(tenantAlbum.getCoverImg());
+        vo.setPurchaseCycle(tenantAlbum.getPurchaseCycle());
+        vo.setSalePrice(tenantAlbum.getSalePrice());
+        //查询曲目表
+
+        List<TenantAlbumVo.MusicSheetData> data = query.getMusicSheetData();
+
+        List<TenantAlbumMusic> tenantAlbumMusics = query.getMusicSheetData().stream().map(next -> {
+
+            AtomicInteger sort = new AtomicInteger(0);
+            return next.getMusicSheetIdList().stream().map(tenantAlbumMusic -> {
+
+                TenantAlbumMusic tenantAlbumMusic1 = new TenantAlbumMusic();
+                //tenantAlbumMusic1.setId(tenantAlbumMusic);
+                tenantAlbumMusic1.setSubjectType(next.getSubjectType());
+                tenantAlbumMusic1.setTenantId(query.getTenantId());
+                tenantAlbumMusic1.setMusicSheetId(tenantAlbumMusic);
+                tenantAlbumMusic1.setDelFlag(true);
+                tenantAlbumMusic1.setTenantAlbumId(tenantAlbum.getId());
+                tenantAlbumMusic1.setSortNumber(sort.getAndIncrement());
+                return tenantAlbumMusic1;
+            }).collect(Collectors.toList());
+
+        }).flatMap(Collection::stream).collect(Collectors.toList());
+
+
+        vo.setTenantAlbumMusics(tenantAlbumMusics);
+
+/*        List<TenantAlbumVo.MusicSheetData> dataList = query.getMusicSheetData();
+        TenantAlbumVo.MusicSheetData data = dataList.get(0);
+        List<Long> list = data.getMusicSheetIdList();
+        data.getSubjectType();
+        Long musicId = list.get(0);
+
+        tenantAlbumMusicService.detail(musicId);*/
+        return HttpResponseResult.succeed(vo);
+    }
+
+
+    /**
+     * 新增专辑
+     */
+    @PostMapping("/insert")
+    @ApiOperation(value = "新增专辑", notes = "新增专辑")
+    @PreAuthorize("@pcs.hasPermissions('tenantAlbum/insert')")
+    public HttpResponseResult<Boolean> insertTenantAlbum( @RequestBody TenantAlbumWrapper.TenantAlbum album) {
+
+
+        return HttpResponseResult.succeed(tenantAlbumService.insertTenantAlbum(album));
+    }
+
+
+}

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantInfoController.java

@@ -46,6 +46,8 @@ public class TenantInfoController extends BaseController {
         return succeed(PageUtil.pageInfo(pages));
     }
 
+
+
     /**
      * 修改数据
      */
@@ -57,6 +59,18 @@ public class TenantInfoController extends BaseController {
         return succeed(tenantInfoService.updateTenantInfo(info));
     }
 
+    /**
+     * 查看详情
+     */
+    @PostMapping("/detail")
+    @ApiOperation(value = "查看详情", notes = "查看详情")
+    @PreAuthorize("@pcs.hasPermissions('tenantInfo/detail')")
+    public HttpResponseResult<TenantInfoWrapper.TenantInfo > detail(@Valid @RequestBody TenantInfo info) {
+        Long id = info.getId();
+        return succeed(tenantInfoService.Infodetail(id));
+    }
+
+
 
     /**
      * 插入数据
@@ -137,7 +151,3 @@ public class TenantInfoController extends BaseController {
 
 
 }
-
-
-
-//sysUser     tenantStaff

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantAlbumMusic.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
 import lombok.Data;
 
 import io.swagger.annotations.ApiModel;
@@ -32,7 +33,7 @@ public class TenantAlbumMusic implements Serializable {
 
     @ApiModelProperty("声部分类(ENSEMBLE, MUSIC, SUBJECT)") 
 	@TableField(value = "subject_type_")
-    private String subjectType;
+    private SubjectTypeEnum subjectType;
 
     @ApiModelProperty("机构专辑ID") 
 	@TableField(value = "tenant_album_id_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantAlbumMapper.java

@@ -22,6 +22,6 @@ public interface TenantAlbumMapper extends BaseMapper<TenantAlbum> {
 	 * @param param TenantAlbumWrapper.TenantAlbumQuery
 	 * @return List<TenantAlbumWrapper.TenantAlbum>
 	 */
-	List<TenantAlbum> selectPage(@Param("page") IPage<TenantAlbum> page, @Param("param") TenantAlbumWrapper.TenantAlbumQuery param);
+	List<TenantAlbumWrapper.TenantAlbum> selectPage(@Param("page") IPage<TenantAlbumWrapper.TenantAlbum> page, @Param("param") TenantAlbumWrapper.TenantAlbumQuery param);
 	
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantAlbumRefMapper.java

@@ -23,5 +23,7 @@ public interface TenantAlbumRefMapper extends BaseMapper<TenantAlbumRef> {
 	 * @return List<TenantAlbumRefWrapper.TenantAlbumRef>
 	 */
 	List<TenantAlbumRef> selectPage(@Param("page") IPage<TenantAlbumRef> page, @Param("param") TenantAlbumRefWrapper.TenantAlbumRefQuery param);
-	
+
+
+    TenantAlbumRef selectByAlbumId(@Param("id") Long id);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantInfoMapper.java

@@ -53,9 +53,14 @@ public interface TenantInfoMapper extends BaseMapper<TenantInfo> {
 
 	TenantInfoWrapper.TenantInfo queryNow(@Param("param") TenantInfoWrapper.TenantInfoQuery query);
 
-	Boolean insertNow(@Param("info") TenantInfoWrapper.TenantInfo info);
 
 	Boolean updateStatusById(@Param("id") long id);
 
 	Boolean updateUnpassStatusById(@Param("id") long id);
+
+	TenantInfoWrapper.TenantInfo selectInfoById(@Param("id") Long id);
+
+	String queryStudentCount(@Param("id") Long id);
+
+	String queryTeacherCount(@Param("id") Long id);
 }

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

@@ -33,7 +33,7 @@ public interface TenantAlbumRefService extends IService<TenantAlbumRef>  {
      * @param tenantAlbumRef TenantAlbumRefWrapper.TenantAlbumRef
      * @return Boolean
      */
-     Boolean add(TenantAlbumRefWrapper.TenantAlbumRef tenantAlbumRef);   
+     Boolean add(TenantAlbumRef tenantAlbumRef);
 
     /**
      * 更新
@@ -49,4 +49,6 @@ public interface TenantAlbumRefService extends IService<TenantAlbumRef>  {
      * @return
      */
     List<TenantAlbumRef> getByAlbumId(Long tenantAlbumId);
+
+    TenantAlbumRef getBytenantAlbumId(Long id);
 }

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

@@ -7,6 +7,8 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.biz.dal.entity.TenantAlbum;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 
+import java.util.List;
+
 /**
  * 机构专辑
  * 2023-07-21 17:32:49
@@ -18,7 +20,7 @@ public interface TenantAlbumService extends IService<TenantAlbum>  {
      * @param id 详情ID
      * @return TenantAlbum
      */
-	TenantAlbum detail(Long id);
+    TenantAlbum detail(Long id);
 
     /**
      * 分页查询
@@ -26,14 +28,14 @@ public interface TenantAlbumService extends IService<TenantAlbum>  {
      * @param query TenantAlbumWrapper.TenantAlbumQuery
      * @return IPage<TenantAlbum>
      */
-    IPage<TenantAlbum> selectPage(IPage<TenantAlbum> page, TenantAlbumWrapper.TenantAlbumQuery query);
+    IPage<TenantAlbumWrapper.TenantAlbum> selectPage(IPage<TenantAlbumWrapper.TenantAlbum> page, TenantAlbumWrapper.TenantAlbumQuery query);
 	
     /**
      * 添加
      * @param tenantAlbum TenantAlbumWrapper.TenantAlbum
      * @return Boolean
      */
-     Boolean add(TenantAlbumWrapper.TenantAlbum tenantAlbum);   
+     Boolean add(TenantAlbum tenantAlbum);
 
     /**
      * 更新
@@ -55,4 +57,22 @@ public interface TenantAlbumService extends IService<TenantAlbum>  {
      * @param userOrderDetailVo
      */
     void orderSuccess(UserOrderDetailVo userOrderDetailVo);
+
+    Boolean insertTenantAlbum(TenantAlbumWrapper.TenantAlbum album);
+
+
+    /**
+     * 添加机构专辑数据
+     * @return
+     */
+    //Boolean addTenantAlbum(TenantAlbum album);
+
+    /**
+     * 添加机构Id
+     * @param tenantId
+     * @return
+     */
+    //Boolean addTenantId(Long tenantId);
+
+   // Boolean addMusicSheet(List<com.yonge.cooleshow.admin.io.request.TenantAlbumVo.MusicSheetData> data);
 }

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

@@ -89,4 +89,6 @@ public interface TenantInfoService extends IService<TenantInfo>  {
      * @return
      */
     Boolean entry(TenantInfoWrapper.TenantInfoQuery query);
+
+    TenantInfoWrapper.TenantInfo Infodetail(Long id);
 }

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

@@ -50,9 +50,9 @@ public class TenantAlbumRefServiceImpl extends ServiceImpl<TenantAlbumRefMapper,
      * @return Boolean
      */
     @Override
-    public Boolean add(TenantAlbumRefWrapper.TenantAlbumRef tenantAlbumRef) {    	
-        
-        return this.save(JSON.parseObject(tenantAlbumRef.jsonString(), TenantAlbumRef.class));
+    public Boolean add(TenantAlbumRef tenantAlbumRef) {
+        return this.save(tenantAlbumRef);
+        //return this.save(JSON.parseObject(tenantAlbumRef.jsonString(), TenantAlbumRef.class));
     }
 
     /**
@@ -78,4 +78,9 @@ public class TenantAlbumRefServiceImpl extends ServiceImpl<TenantAlbumRefMapper,
                 .eq(TenantAlbumRef::getTenantAlbumId, tenantAlbumId)
                 .list();
     }
+
+    @Override
+    public TenantAlbumRef getBytenantAlbumId(Long id) {
+        return baseMapper.selectByAlbumId(id);
+    }
 }

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

@@ -1,20 +1,15 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.lang.UUID;
-import cn.hutool.core.lang.generator.SnowflakeGenerator;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
-import com.yonge.cooleshow.common.enums.EActivationCode;
 import com.yonge.toolset.base.exception.BizException;
-import com.yonge.toolset.base.util.StringUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,10 +18,13 @@ import lombok.extern.slf4j.Slf4j;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
 import org.springframework.transaction.annotation.Transactional;
+import springfox.documentation.spring.web.json.Json;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -53,10 +51,10 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
     private UserOrderService userOrderService;
 
     @Autowired
-    private TenantActivationCodeService tenantActivationCodeService;
+    private SysUserFeignService sysUserFeignService;
 
     @Autowired
-    private TenantAlbumPurchaseService tenantAlbumPurchaseService;
+    private TenantAlbumMusicService tenantAlbumMusicService;
 
     /**
      * 查询详情
@@ -76,9 +74,9 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
      * @return IPage<TenantAlbum>
      */
     @Override
-    public IPage<TenantAlbum> selectPage(IPage<TenantAlbum> page, TenantAlbumWrapper.TenantAlbumQuery query) {
-        
-        return page.setRecords(baseMapper.selectPage(page, query));
+    public IPage<TenantAlbumWrapper.TenantAlbum> selectPage(IPage<TenantAlbumWrapper.TenantAlbum> page, TenantAlbumWrapper.TenantAlbumQuery query) {
+        List<TenantAlbumWrapper.TenantAlbum> albums = baseMapper.selectPage(page, query);
+        return page.setRecords(albums);
     }
 
     /**
@@ -87,9 +85,10 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
      * @return Boolean
      */
     @Override
-    public Boolean add(TenantAlbumWrapper.TenantAlbum tenantAlbum) {
+    public Boolean add(TenantAlbum tenantAlbum) {
 
-        return this.save(JSON.parseObject(tenantAlbum.jsonString(), TenantAlbum.class));
+        //return this.save(JSON.parseObject(tenantAlbum.jsonString(), TenantAlbum.class));
+        return this.save(tenantAlbum);
     }
 
     /**
@@ -116,10 +115,9 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
             throw new BizException("订单商品信息为空");
         }
 
-
-        TenantAlbumWrapper.TenantAlbumContent tenantAlbumContent = JSON
-                .parseObject(orderGoodsInfo.getBizContent(), TenantAlbumWrapper.TenantAlbumContent.class);
-        if (tenantAlbumContent == null) {
+        TenantAlbumWrapper.TenantAlbumBuy tenantAlbumBuy = JSON
+                .parseObject(JSON.toJSONString(orderGoodsInfo.getBizContent()), TenantAlbumWrapper.TenantAlbumBuy.class);
+        if (tenantAlbumBuy == null) {
             log.error("订单创建前检测，订单商品信息为空");
             throw new BizException("订单商品信息为空");
         }
@@ -131,7 +129,6 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
             log.error("订单创建前检测，专辑不存在，bizId={}", orderGoodsInfo.getBizId());
             throw new BizException("订单商品信息为空");
         }
-        tenantAlbumContent.setBuyCycle(tenantAlbum.getPurchaseCycle());
 
         // 查询专辑所在机构
         List<TenantAlbumRef> refList =
@@ -164,10 +161,8 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                 }
                 price = tenantAlbum.getSalePrice();
                 userOrderDetail.setMerchId(tenantInfo.getId());
-                tenantAlbumContent.setBuyMultiple(1);
-                tenantAlbumContent.setBuyNumber(1);
-                tenantAlbumContent.setBuyCycle(tenantAlbumContent.getBuyCycle());
-                tenantAlbumContent.setTenantId(tenantInfo.getId());
+                tenantAlbumBuy.setBuyCycle(1);
+                tenantAlbumBuy.setBuyNumber(1);
                 break;
             }
 
@@ -184,8 +179,6 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                 }
                 price = tenantAlbum.getOriginalPrice();
                 userOrderDetail.setMerchId(0L);
-                tenantAlbumContent.setTenantId(tenantStaff.getTenantId());
-                tenantAlbumContent.setBuyCycle(tenantAlbumContent.getBuyCycle()*tenantAlbumContent.getBuyMultiple());
                 break;
             }
         }
@@ -194,10 +187,9 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
 
         userOrderDetail.setGoodUrl(userOrderService.getGoodUrlByType(orderGoodsInfo.getGoodType()));
         userOrderDetail.setBizId(tenantAlbum.getId());
-        userOrderDetail.setBizContent(JSON.toJSONString(tenantAlbumContent));
         userOrderDetail.setGoodNum(orderGoodsInfo.getGoodNum());
         userOrderDetail.setOriginalPrice(price.multiply(new BigDecimal(orderGoodsInfo.getGoodNum()))
-                .multiply(new BigDecimal(tenantAlbumContent.getBuyMultiple())));
+                .multiply(new BigDecimal(tenantAlbumBuy.getBuyCycle())));
         userOrderDetail.setCouponAmount(BigDecimal.ZERO);
         userOrderDetail.setExpectPrice(userOrderDetail.getOriginalPrice());
         userOrderDetail.setActualPrice(userOrderDetail.getExpectPrice().subtract(userOrderDetail.getCouponAmount()));
@@ -216,45 +208,69 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
     public void orderSuccess(UserOrderDetailVo userOrderDetailVo) {
 
         // 学生 插入机构专辑购买数据
-        // 学生购买机构专辑
-        switch (userOrderDetailVo.getOrderClient()) {
-            case STUDENT: {
-                tenantActivationCodeService.addUserTenantAlbumRecord(userOrderDetailVo.getUserId(),userOrderDetailVo);
 
-                break;
-            }
 
-            case TENANT: {
-                // 机构   插入机构专辑购买记录，生成机构专辑激活码
-
-                TenantAlbumWrapper.TenantAlbumContent tenantAlbumContent = JSON
-                        .parseObject(userOrderDetailVo.getBizContent(), TenantAlbumWrapper.TenantAlbumContent.class);
-                TenantAlbumPurchase tenantAlbumPurchase = new TenantAlbumPurchase();
-                tenantAlbumPurchase.setTenantId(tenantAlbumContent.getTenantId());
-                tenantAlbumPurchase.setTenantAlbumId(userOrderDetailVo.getBizId());
-                tenantAlbumPurchase.setPurchaseTime(userOrderDetailVo.getCreateTime());
-                tenantAlbumPurchase.setPurchaseQuantity(userOrderDetailVo.getGoodNum());
-                tenantAlbumPurchase.setPurchaseCycle(tenantAlbumContent.getBuyCycle());
-                tenantAlbumPurchase.setActiveQuantity(0);
-                tenantAlbumPurchase.setPurchasePrice(userOrderDetailVo.getActualPrice());
-                tenantAlbumPurchase.setPurchaseStatus(OrderStatusEnum.PAID.getCode());
-                tenantAlbumPurchaseService.save(tenantAlbumPurchase);
-
-                List<TenantActivationCode> tenantActivationCodes = new ArrayList<>();
-                for (int i = 0; i < userOrderDetailVo.getGoodNum(); i++) {
-                    TenantActivationCode tenantActivationCode = new TenantActivationCode();
-                    tenantActivationCode.setTenantId(tenantAlbumContent.getTenantId());
-                    tenantActivationCode.setTenantAlbumId(tenantAlbumContent.getTenantAlbumId());
-                    tenantActivationCode.setTenantAlbumPurchaseId(tenantAlbumPurchase.getId());
-//                    tenantActivationCode.setActivationCode(StringUtil.DeciamlToThirtySix(IdWorker.get32UUID()));
-                    tenantActivationCode.setActivationCode(IdWorker.get32UUID());
-                    tenantActivationCode.setSendStatus(EActivationCode.WAIT);
-                    tenantActivationCodes.add(tenantActivationCode);
-                }
-                tenantActivationCodeService.saveBatch(tenantActivationCodes);
-                break;
-            }
+        // 机构   插入机构专辑购买记录，生成机构专辑激活码
+
+    }
+
+    /**
+     * 新增机构专辑
+     * @param album
+     * @return
+     */
+    @Override
+    public Boolean insertTenantAlbum(TenantAlbumWrapper.TenantAlbum album) {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
+                .last("limit 1").one();
+        if (tenantInfo == null) {
+            throw new BizException("非法请求");
+        }
+
+        //给机构专辑赋值
+        TenantAlbum tenantAlbum = new TenantAlbum();
+        tenantAlbum.setName(album.getName());
+        tenantAlbum.setDescribe(album.getDescribe());
+        tenantAlbum.setCoverImg(album.getCoverImg());
+        tenantAlbum.setPurchaseCycle(album.getPurchaseCycle());
+        tenantAlbum.setSalePrice(album.getSalePrice());
+
+        //tenantAlbumService.addTenantAlbum(tenantAlbum);
+        add(tenantAlbum);
+        //关联表赋值
+        //tenantAlbumService.addTenantId(album.getTenantId());
+        TenantAlbumRef ref = new TenantAlbumRef();
+        ref.setTenantAlbumId(album.getId());
+        ref.setTenantId(album.getTenantId());
+        tenantAlbumRefService.add(ref);
+        //曲目表赋值
+        List<TenantAlbumWrapper.TenantAlbum.MusicSheetData> data = album.getMusicSheetData();
+
+        List<TenantAlbumMusic> tenantAlbumMusics = album.getMusicSheetData().stream().map(next -> {
+
+            AtomicInteger sort = new AtomicInteger(0);
+            return next.getMusicSheetIdList().stream().map(tenantAlbumMusic -> {
+
+                TenantAlbumMusic tenantAlbumMusic1 = new TenantAlbumMusic();
+                //tenantAlbumMusic1.setId(tenantAlbumMusic);
+                tenantAlbumMusic1.setSubjectType(next.getSubjectType());
+                tenantAlbumMusic1.setTenantId(album.getTenantId());
+                tenantAlbumMusic1.setMusicSheetId(tenantAlbumMusic);
+                tenantAlbumMusic1.setDelFlag(true);
+                tenantAlbumMusic1.setTenantAlbumId(tenantAlbum.getId());
+                tenantAlbumMusic1.setSortNumber(sort.getAndIncrement());
+                return tenantAlbumMusic1;
+            }).collect(Collectors.toList());
+
+        }).flatMap(Collection::stream).collect(Collectors.toList());
+
+        if(!tenantAlbumMusics.isEmpty()){
+            tenantAlbumMusicService.saveBatch(tenantAlbumMusics,100);
         }
 
+        return true;
     }
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -17,6 +18,7 @@ import com.yonge.cooleshow.biz.dal.mapper.TenantStaffMapper;
 import com.yonge.cooleshow.biz.dal.service.SysAreaService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -83,8 +85,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         if (id == null || id == -1) {
             return null;
         }
-
-        return baseMapper.selectById(id);
+        TenantInfo info = baseMapper.selectById(id);
+        return info;
     }
 
     /**
@@ -105,7 +107,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         for (int i = 0; i < tenantInfos.size(); i++) {
             TenantInfoWrapper.TenantInfo info = tenantInfos.get(i);
             long id = info.getId();
-            listId.add(i, (int) id);
+            listId.add(i,(int)id);
         }
         //查询对应机构的老师数量
         List<Integer> listTeacher = new ArrayList<>();
@@ -436,6 +438,18 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         return  true;
     }
 
+    @Override
+    public TenantInfoWrapper.TenantInfo Infodetail(Long id) {
+        if (id == null || id == -1) {
+            return null;
+        }
+        TenantInfoWrapper.TenantInfo info = tenantInfoMapper.selectInfoById(id);
+
+        info.setStudentCounts(tenantInfoMapper.queryStudentCount(id));
+        info.setTeacherCounts(tenantInfoMapper.queryTeacherCount(id));
+        return info;
+    }
+
 
     /**
      * 匹配地区码与省市区

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

@@ -1,10 +1,17 @@
 package com.yonge.cooleshow.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
-import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.SubjectTypeEnum;
+import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.Optional;
 
 import lombok.AllArgsConstructor;
@@ -25,13 +32,16 @@ public class TenantAlbumWrapper {
     @NoArgsConstructor
     @AllArgsConstructor
     @ApiModel(" TenantAlbumQuery-机构专辑")
-    public static class TenantAlbumQuery implements QueryInfo {
+    public static class   TenantAlbumQuery extends QueryInfo {
+
+        @ApiModelProperty("主键ID")
+        private Long id;
 
         @ApiModelProperty("当前页")
-        private Integer page;
+        private int page;
 
         @ApiModelProperty("分页行数")
-        private Integer rows;
+        private int rows;
 
         @ApiModelProperty("关键字匹配")
         private String keyword;
@@ -39,6 +49,12 @@ public class TenantAlbumWrapper {
         @ApiModelProperty("机构ID")
         private Long tenantId;
 
+        @ApiModelProperty("专辑名称")
+        private String name;
+
+        @ApiModelProperty("机构名称")
+        private String tenantName;
+
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }
@@ -52,9 +68,61 @@ public class TenantAlbumWrapper {
         }
     }
 
-    @ApiModel(" TenantAlbum-机构专辑")
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" TenantAlbum-机构专辑返回")
     public static class TenantAlbum {
 
+            @ApiModelProperty("主键ID")
+            private Long id;
+
+            @ApiModelProperty("机构ID")
+            private Long tenantId;
+
+            @ApiModelProperty("专辑名称")
+            private String name;
+
+            @ApiModelProperty("机构名称")
+            private String tenantName;
+
+            @ApiModelProperty("专辑介绍")
+            private String describe;
+
+            @ApiModelProperty("专辑封面")
+            private String coverImg;
+
+            @ApiModelProperty("曲目数")
+            private Integer musicNum;
+
+            @ApiModelProperty("平台价格")
+            private BigDecimal originalPrice;
+
+            @ApiModelProperty("机构价格")
+            private BigDecimal salePrice;
+
+            @ApiModelProperty("购买周期")
+            private Integer purchaseCycle;
+
+            @ApiModelProperty("曲目声部分类(多个,分隔)")
+            private String subjectTypes;
+
+            @ApiModelProperty("启用状态")
+            private Boolean status;
+
+        @ApiModelProperty("删除标识")
+        private Boolean delFlag;
+
+        @ApiModelProperty("更新时间")
+        private Date updateTime;
+
+        @ApiModelProperty("创建时间")
+        private Date createTime;
+
+        @ApiModelProperty("曲目相关信息")
+        private List<MusicSheetData> musicSheetData = new ArrayList<>();
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -62,6 +130,14 @@ public class TenantAlbumWrapper {
         public static TenantAlbum from(String json) {
             return JSON.parseObject(json, TenantAlbum.class);
         }
+
+        @Data
+        public static class MusicSheetData{
+            private SubjectTypeEnum subjectType;
+
+            private List<Long> musicSheetIdList = new ArrayList<>();
+        }
+
     }
 
     @Data

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMapper.xml

@@ -21,10 +21,20 @@
         , t.create_time_ AS createTime
         </sql> 
     
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.TenantAlbum">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper$TenantAlbum">
 		SELECT         
         	<include refid="baseColumns" />
+        i.name_ AS tenantName
 		FROM tenant_album t
+        LEFT JOIN tenant_album_ref r on  t.id_ = r.tenant_album_id_
+        left join tenant_info i on r.tenant_id_ = i.id_
+        where 1=1
+        <if test="param.name != null and param.name != ''">
+            and t.name_ = #{param.name}
+        </if>
+        <if test="param.tenantId != null ">
+            and i.id_= #{param.tenantId}
+        </if>
 	</select>
     
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumRefMapper.xml

@@ -18,5 +18,10 @@
         	<include refid="baseColumns" />
 		FROM tenant_album_ref t
 	</select>
-    
+    <select id="selectByAlbumId" resultType="com.yonge.cooleshow.biz.dal.entity.TenantAlbumRef">
+        select <include refid="baseColumns" />
+        from tenant_album_ref
+        where tenant_album_id_ = #{id}
+    </select>
+
 </mapper>

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -27,11 +27,6 @@
         values (#{param.name},#{param.logo},#{param.briefIntroduction},#{param.provinceCode},#{param.cityCode},#{param.regionCode},#{param.username},#{param.phone})
     </insert>
 
-    <insert id="insertNow">
-        insert into tenant_entry_record (id_,tenant_id_,
-        )
-        (id_,)
-    </insert>
 
     <update id="updateInfo">
         update tenant_info
@@ -115,10 +110,16 @@
         SELECT count(t.tenant_id_) FROM teacher t where t.tenant_id_ IN (<foreach collection="listId" separator="," item="Id">#{Id}</foreach>)
     </select>
 
+    <select id="queryTeacherCount" resultType="java.lang.String">
+        SELECT count(t.tenant_id_) FROM teacher t where t.tenant_id_ = #{id}
+    </select>
+
     <select id="queryStudentCounts" resultType="java.lang.Integer">
         SELECT count(s.tenant_id_) FROM student s where s.tenant_id_ IN (<foreach collection="listId" separator="," item="Id">#{Id}</foreach>)
     </select>
-
+    <select id="queryStudentCount" resultType="java.lang.String">
+        SELECT count(s.tenant_id_) FROM student s where s.tenant_id_ = #{id}
+    </select>
     <select id="selectApplyPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper$TenantInfo">
         SELECT
         id_ as id,
@@ -202,5 +203,28 @@
         id_ = #{param.id}
         </if>
     </select>
+    <select id="selectInfoById" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper$TenantInfo">
+        select
+                  t.id_ AS id
+                , t.name_ AS name
+                , t.logo_ AS logo
+                , t.province_code_ AS provinceCode
+                , t.city_code_ AS cityCode
+                , t.region_code_ AS regionCode
+                , t.username_ AS userName
+                , t.user_id_ AS userId
+                , t.phone_ AS phone
+                , t.update_time_ AS updateTime
+                , t.create_time_ AS createTime
+                , t.brief_Introduction_ AS briefIntroduction
+        from tenant_info t
+        where 1=1
+        <if test="id != null">
+           id_ = #{id}
+        </if>
+        }
+
+    </select>
+
 
 </mapper>

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumController.java

@@ -63,7 +63,9 @@ public class TenantAlbumController extends BaseController {
         TenantInfo tenantInfo = getTenantInfo();
         query.setTenantId(tenantInfo.getId());
         // 查询数据
-        IPage<TenantAlbum> pages = tenantAlbumService.selectPage(QueryInfo.getPage(query), query);
+        //IPage<TenantAlbum> pages = tenantAlbumService.selectPage(QueryInfo.getPage(query), query);
+        //todo
+        IPage<TenantAlbum> pages = null;
         // 数据类型转换
         List<TenantAlbumVo.TenantAlbum> records = JSON.parseArray(JSON.toJSONString(pages.getRecords()),
                 TenantAlbumVo.TenantAlbum.class);