Merge branch 'develop'

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

@@ -17,6 +17,7 @@ import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.common.enums.EActivationCode;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -403,11 +404,26 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
         }
         List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery()
                 .in(TenantAlbumMusic::getTenantAlbumId, bizIds)
+                .eq(TenantAlbumMusic::getDelFlag,0)
                 .list();
         if (CollectionUtils.isEmpty(list)) {
             return new HashMap<>();
         }
-        return list.stream().collect(Collectors.groupingBy(TenantAlbumMusic::getTenantAlbumId,Collectors.counting()));
+        List<Long> musicIds = list.stream().map(o -> o.getMusicSheetId()).collect(Collectors.toList());
+        List<MusicSheet> musicList = musicSheetService.lambdaQuery()
+                .eq(MusicSheet::getDelFlag, false)
+                .eq(MusicSheet::getState, YesOrNoEnum.YES)
+                .eq(MusicSheet::getAuditVersion, YesOrNoEnum.NO)
+                .in(MusicSheet::getId, musicIds)
+                .list();
+        if (CollectionUtils.isEmpty(musicList)) {
+            return new HashMap<>();
+        }
+        // 曲目ID集合
+        List<Long> musicSheetIds = musicList.stream().map(o -> o.getId()).collect(Collectors.toList());
+
+        return list.stream().filter(o -> musicSheetIds.contains(o.getMusicSheetId()))
+                .collect(Collectors.groupingBy(TenantAlbumMusic::getTenantAlbumId, Collectors.counting()));
     }
 
     @Override

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

@@ -134,8 +134,10 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
 
 
                 TenantInfo tenantInfo = tenantInfoService.getById(one.getTenantId());
-                vo.setTenantName(tenantInfo.getName());
-                vo.setTenantImg(tenantInfo.getLogo());
+                if (tenantInfo != null) {
+                    vo.setTenantName(tenantInfo.getName());
+                    vo.setTenantImg(tenantInfo.getLogo());
+                }
                 //查询机构专辑曲目表
                 List<TenantAlbumMusic> tenantAlbumMusics = tenantAlbumMusicService.lambdaQuery()
                         .eq(TenantAlbumMusic::getTenantAlbumId, i.getId())

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/StudentVo.java

@@ -72,6 +72,9 @@ public class StudentVo extends Student {
     @ApiModelProperty(value = "imToken")
     private String imToken;
 
+
+    private String imUserId;
+
     public YesOrNoEnum getDelFlag() {
         return delFlag;
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/StudentController.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -41,6 +43,8 @@ public class StudentController extends BaseController {
     @Resource
     private SysUserFeignService sysUserFeignService;
 
+    @Autowired
+    private ImGroupService imGroupService;
 
     @ApiOperation(value = "查询指定学员信息-融云token")
     @GetMapping("/queryUserById")
@@ -114,6 +118,7 @@ public class StudentController extends BaseController {
                     vo.setUserStatus(UserStatusEnum.NORMAL);
                 }
             }
+            vo.setImUserId(imGroupService.getImUserId(vo.getUserId(), ClientEnum.STUDENT));
         }
         return succeed(PageUtil.pageInfo(pages));
     }