Merge remote-tracking branch 'origin/feature/1007-develop' into feature/1007-develop

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/ImGroupController.java

@@ -15,17 +15,25 @@ import com.yonge.toolset.utils.validator.ValidationKit;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 /**
  * 即时通讯群组(ImGroup)表控制层
@@ -35,6 +43,7 @@ import java.util.List;
  */
 @Api(tags = "即时通讯群组")
 @RestController
+@Slf4j
 @RequestMapping("${app-config.url.admin:}/imGroup")
 public class ImGroupController extends BaseController {
     /**
@@ -73,14 +82,13 @@ public class ImGroupController extends BaseController {
     @ApiOperation("退出群聊")
     @PostMapping(value = "/quit/{groupId}")
     public HttpResponseResult quit(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId,
-                                   @RequestParam(value = "quit",required = false,defaultValue = "true") boolean quit
-    ) throws Exception {
-        imGroupService.quit(groupId,sysUserService.getUserId(), ClientEnum.STUDENT,quit);
+                                   @RequestParam(value = "quit",required = false, defaultValue = "false") boolean quit
+                                   ) throws Exception {
+        imGroupService.quit(groupId,sysUserService.getUserId(), ClientEnum.STUDENT, quit);
         return succeed();
     }
 
 
-
     @GetMapping(value = "/syncImHistoryMessageTask")
     // 融云同步即时通讯聊天记录
     public void syncImHistoryMessageTask(String date) throws Exception {
@@ -112,30 +120,74 @@ public class ImGroupController extends BaseController {
 
     }
 
-
     @ApiOperation("IM导入消息")
     @PostMapping(value = "/ImportIM")
-    public void ImportIM(String groupId) throws Exception {
-        List<ImHistoryMessage> info;
-        //计算总数据量
-        double count = imGroupService.queryCount();
-        //计算调用次数
-        int num = (int) Math.ceil(count / 100);
-        for (int i = 1; i <=num ; i++) {
-            int page =i;
-            int size =100;
-            //获取融云消息
-            //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
-            info = imGroupService.getRongYunInfo(page,size);
-            //IM导入
-            imGroupService.importInfo(info);
-        }
+    public void ImportIM() throws Exception {
+
+        CompletableFuture.runAsync(() -> {
+            try {
+                List<ImHistoryMessage> info;
+                //计算总数据量
+                int count = imGroupService.queryCount();
+                //计算调用次数
+//                int num = (int) Math.ceil(count / 100);
+//                for (int i = 1; i <=num ; i++) {
+//                    int page =i;
+//                    int size =100;
+//                    //获取融云消息
+//                    //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+//                    info = imGroupService.getRongYunInfo(page,size);
+//                    //IM导入
+//                    imGroupService.importInfo(info);
+//                }
+                info = imGroupService.getRongYunInfo(1,count);
+                //IM导入
+                imGroupService.importInfo(info);
+            } catch (Exception e) {
+                log.error("IM导入消息失败", e);
+            }
+        });
     }
 
+
+    @ApiOperation("清除导入会话")
+    @PostMapping(value = "/clearImportIm")
+    public void clearImportIm() throws Exception {
+
+        CompletableFuture.runAsync(() -> {
+            try {
+                List<ImHistoryMessage> info;
+                //计算总数据量
+                int count = imGroupService.queryCount();
+                //计算调用次数
+//                int num = (int) Math.ceil(count / 100);
+//                for (int i = 1; i <=num ; i++) {
+//                    int page =i;
+//                    int size =100;
+//                    //获取融云消息
+//                    //List<ImGroup> list = imGroupService.lambdaQuery().last("limit "+(page-1)*size+","+size).list();
+//                    info = imGroupService.getRongYunInfo(page,size);
+//                    //IM导入
+//                    imGroupService.importInfo(info);
+//                }
+                info = imGroupService.getRongYunInfo(1,count);
+                //IM导入
+                imGroupService.clearImportIm(info);
+            } catch (Exception e) {
+                log.error("IM导入消息失败", e);
+            }
+        });
+    }
     @GetMapping(value = "/groupTransfer")
     @ApiOperation("群导入")
-    public void groupTransfer(String groupId) {
-        imGroupService.groupTransfer();
+    public void groupTransfer() {
+        CompletableFuture.runAsync(() -> {
+            try {
+                imGroupService.groupTransfer();
+            } catch (Exception e) {
+                log.error("群导入失败", e);
+            }
+        });
     }
 
     @GetMapping(value = "/importUser")

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TeacherController.java

@@ -116,37 +116,37 @@ public class TeacherController extends BaseController {
     @ApiOperation(value = "查询分页", notes = "传入teacher")
     @PreAuthorize("@pcs.hasPermissions('teacher/page')")
     public HttpResponseResult<PageInfo<TeacherVo>> page(@RequestBody TeacherSearch query) {
-
-        if(StringUtils.isNotBlank(query.getUserStatus())){
-            switch (query.getUserStatus()) {
-                case "LOCKED":
-                    query.setDelFlag(YesOrNoEnum.NO);
-                    query.setLockFlag(UserLockFlag.LOCKED);
-                    break;
-                case "CLOSED":
-                    query.setDelFlag(YesOrNoEnum.YES);
-                    break;
-
-                default:
-                    query.setDelFlag(YesOrNoEnum.NO);
-                    query.setLockFlag(UserLockFlag.NORMAL);
-                    break;
-            }
-        }
+    	
+    	if(StringUtils.isNotBlank(query.getUserStatus())){
+    		switch (query.getUserStatus()) {
+			case "LOCKED":
+				query.setDelFlag(YesOrNoEnum.NO);
+				query.setLockFlag(UserLockFlag.LOCKED);
+				break;
+			case "CLOSED":
+				query.setDelFlag(YesOrNoEnum.YES);
+				break;
+
+			default:
+				query.setDelFlag(YesOrNoEnum.NO);
+				query.setLockFlag(UserLockFlag.NORMAL);
+				break;
+			}
+    	}
         IPage<TeacherVo> pages = teacherService.selectPage(PageUtil.getPage(query), query);
-        List<TeacherVo> rows = pages.getRecords();
-
-        for(TeacherVo vo : rows){
-            if(vo.getDelFlag() == YesOrNoEnum.YES){
-                vo.setUserStatus(UserStatusEnum.CLOSED);
-            }else{
-                if(vo.getLockFlag() == UserLockFlag.LOCKED){
-                    vo.setUserStatus(UserStatusEnum.LOCKED);
-                }else{
-                    vo.setUserStatus(UserStatusEnum.NORMAL);
-                }
-            }
-        }
+		List<TeacherVo> rows = pages.getRecords();
+		
+		for(TeacherVo vo : rows){
+			if(vo.getDelFlag() == YesOrNoEnum.YES){
+				vo.setUserStatus(UserStatusEnum.CLOSED);
+			}else{
+				if(vo.getLockFlag() == UserLockFlag.LOCKED){
+					vo.setUserStatus(UserStatusEnum.LOCKED);
+				}else{
+					vo.setUserStatus(UserStatusEnum.NORMAL);
+				}
+			}
+		}
         return succeed(PageUtil.pageInfo(pages));
     }
 
@@ -177,43 +177,43 @@ public class TeacherController extends BaseController {
     public void export(HttpServletResponse response, @RequestBody TeacherSearch queryInfo) throws IOException {
         queryInfo.setPage(1);
         queryInfo.setRows(49999);
-
-        if (StringUtils.isNotBlank(queryInfo.getUserStatus())) {
-            switch (queryInfo.getUserStatus()) {
-                case "LOCKED":
-                    queryInfo.setDelFlag(YesOrNoEnum.NO);
-                    queryInfo.setLockFlag(UserLockFlag.LOCKED);
-                    break;
-                case "CLOSED":
-                    queryInfo.setDelFlag(YesOrNoEnum.YES);
-                    break;
-
-                default:
-                    queryInfo.setDelFlag(YesOrNoEnum.NO);
-                    queryInfo.setLockFlag(UserLockFlag.NORMAL);
-                    break;
-            }
-        }
+    	
+    	if(StringUtils.isNotBlank(queryInfo.getUserStatus())){
+    		switch (queryInfo.getUserStatus()) {
+			case "LOCKED":
+				queryInfo.setDelFlag(YesOrNoEnum.NO);
+				queryInfo.setLockFlag(UserLockFlag.LOCKED);
+				break;
+			case "CLOSED":
+				queryInfo.setDelFlag(YesOrNoEnum.YES);
+				break;
+
+			default:
+				queryInfo.setDelFlag(YesOrNoEnum.NO);
+				queryInfo.setLockFlag(UserLockFlag.NORMAL);
+				break;
+			}
+    	}
         List<TeacherVo> rows = teacherService.selectPage(PageUtil.getPage(queryInfo), queryInfo).getRecords();
         if (rows.size() < 1) {
             throw new BizException("没有可导出数据");
         }
-
-        for(TeacherVo vo : rows){
-            if(vo.getDelFlag() == YesOrNoEnum.YES){
-                vo.setUserStatus(UserStatusEnum.CLOSED);
-            }else{
-                if(vo.getLockFlag() == UserLockFlag.LOCKED){
-                    vo.setUserStatus(UserStatusEnum.LOCKED);
-                }else{
-                    vo.setUserStatus(UserStatusEnum.NORMAL);
-                }
-            }
-        }
+		
+		for(TeacherVo vo : rows){
+			if(vo.getDelFlag() == YesOrNoEnum.YES){
+				vo.setUserStatus(UserStatusEnum.CLOSED);
+			}else{
+				if(vo.getLockFlag() == UserLockFlag.LOCKED){
+					vo.setUserStatus(UserStatusEnum.LOCKED);
+				}else{
+					vo.setUserStatus(UserStatusEnum.NORMAL);
+				}
+			}
+		}
         for(TeacherVo vo : rows){
-            if(StringUtils.isNotBlank(vo.getTag())){
-                vo.setTag(vo.getTag().replace("STYLE", "个人风采").replace("LIVE", "直播课").replace("VIDEO", "视频课").replace("MUSIC", "乐谱").replace("DEGREE", "学历").replace("TEACHER", "教资"));
-            }
+        	if(StringUtils.isNotBlank(vo.getTag())){
+        		vo.setTag(vo.getTag().replace("STYLE", "个人风采").replace("LIVE", "直播课").replace("VIDEO", "视频课").replace("MUSIC", "乐谱").replace("DEGREE", "学历").replace("TEACHER", "教资"));
+        	}
         }
         OutputStream outputStream = response.getOutputStream();
         try {
@@ -281,10 +281,10 @@ public class TeacherController extends BaseController {
     // @PreAuthorize("@pcs.hasPermissions('teacher/bindingUserList')")
     public HttpResponseResult<PageInfo<TeacherBindingUserVo.BindingUserList>> bindingUserList(@RequestBody  @Valid  TeacherBindingUserVo.BindingUserQuery query) {
         IPage<UserBindingTeacherWrapper> wrapperIPage = userBindingTeacherService.selectBindingUserPage(PageUtil.getPage(query),
-                TeacherBindingUserQueryInfo.BindingUserQuery.from(query.jsonString()));
+                                                        TeacherBindingUserQueryInfo.BindingUserQuery.from(query.jsonString()));
         // 数据转换
         List<TeacherBindingUserVo.BindingUserList> pageInfos = JSON.parseArray(JSON.toJSONString(wrapperIPage.getRecords()),
-                TeacherBindingUserVo.BindingUserList.class);
+                                                                               TeacherBindingUserVo.BindingUserList.class);
 
         return succeed(PageUtil.getPageInfo(wrapperIPage,pageInfos));
     }
@@ -295,10 +295,10 @@ public class TeacherController extends BaseController {
     // @PreAuthorize("@pcs.hasPermissions('teacher/selectBindingUserCourse')")
     public HttpResponseResult<PageInfo<TeacherBindingUserVo.BindingStudentCourseList>> selectBindingUserCourse(@RequestBody @Valid TeacherBindingUserVo.BindingStudentCourseQuery query) {
         IPage<UserBindingCourseWrapper> wrapperIPage = userBindingTeacherService.selectBindingUserCoursePage(PageUtil.getPage(query),
-                TeacherBindingUserQueryInfo.BindingStudentCourseQuery.from(query.jsonString()));
+                                                                                                             TeacherBindingUserQueryInfo.BindingStudentCourseQuery.from(query.jsonString()));
         // 数据转换
         List<TeacherBindingUserVo.BindingStudentCourseList> pageInfos = JSON.parseArray(JSON.toJSONString(wrapperIPage.getRecords()),
-                TeacherBindingUserVo.BindingStudentCourseList.class);
+                                                                                        TeacherBindingUserVo.BindingStudentCourseList.class);
 
         return succeed(PageUtil.getPageInfo(wrapperIPage, pageInfos));
     }

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantAccountRecordController.java

@@ -41,6 +41,7 @@ import java.util.List;
 @RequestMapping("${app-config.url.admin:}/tenantAccountRecord")
 @Api(value = "机构账户流水表", tags = "机构账户流水表")
 public class TenantAccountRecordController extends BaseController {
+
     @Autowired
     private TenantAccountRecordService tenantAccountRecordService;
 
@@ -112,8 +113,8 @@ public class TenantAccountRecordController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('tenantAccountRecord/import')")
     public HttpResponseResult<FileImportInfo> importFile(@RequestBody FileImportInfoWrapper.FileImport wrapper) {
 
-
         wrapper.setImportUrl(URLEncodeUtil.encode(wrapper.getImportUrl()));
+
         // 读取数据
         return HttpResponseResult.succeed(excelAnalyseCoreService.analyseReadExcelData(
                 JSON.parseObject(JSON.toJSONString(wrapper), FileImportInfoWrapper.FileImportInfo.class)));

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

@@ -39,7 +39,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -199,12 +204,13 @@ public class TenantAlbumController {
         if (CollectionUtils.isNotEmpty(list)){
             throw new BizException("当前机构已有专辑");
         }
+
         // 检查曲目重复
         if (CollectionUtils.isNotEmpty(album.getMusicSheetData())) {
             List<Long> musicIds = album.getMusicSheetData().stream().flatMap(o -> o.getMusicSheetList().stream().map(m -> m.getId())).collect(Collectors.toList());
             Set<Long> musicSet = new HashSet<>(musicIds);
             if (musicSet.size() < musicIds.size()) {
-                throw new BizException("不予许添加相同的曲目");
+                throw new BizException("不能添加相同的曲目");
             }
         }
 
@@ -221,11 +227,11 @@ public class TenantAlbumController {
                         tenantAlbumSheet.setLevel(m.getLevel());
                         tenantAlbumSheet.setType(m.getType());
                         tenantAlbumSheet.setId(m.getId().toString());
-                        return tenantAlbumSheet;
+                       return tenantAlbumSheet;
                     }).collect(Collectors.toList()));
                     sheetData.setSubjectType(next.getSubjectType());
                     return sheetData;
-                }
+        }
         ).collect(Collectors.toList());
         tenantAlbumService.insertTenantAlbum(album.getTenantId(), tenantAlbum, musicSheetDataList);
         return HttpResponseResult.succeed();
@@ -235,6 +241,7 @@ public class TenantAlbumController {
     @ApiOperation(value = "修改专辑", notes = "修改专辑")
     @PreAuthorize("@pcs.hasPermissions('tenantAlbum/update')")
     public HttpResponseResult<Boolean> update( @RequestBody TenantAlbumVo.TenantAlbum album) {
+
         //判断当前机构是否已经绑定机构专辑
         Long tenantId = album.getTenantId();
         List<TenantAlbumMusic> list = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantId, tenantId).list();
@@ -244,14 +251,15 @@ public class TenantAlbumController {
                     throw new BizException("当前机构已有专辑");
                 }
             });
-
         }
+
         // 检查曲目重复
         if (CollectionUtils.isNotEmpty(album.getMusicSheetData())) {
-            List<Long> musicIds = album.getMusicSheetData().stream().flatMap(o -> o.getMusicSheetList().stream().map(m -> m.getId())).collect(Collectors.toList());
+            List<Long> musicIds = album.getMusicSheetData().stream().flatMap(o -> o.getMusicSheetList()
+                    .stream().map(TenantAlbumVo.MusicObject::getId)).collect(Collectors.toList());
             Set<Long> musicSet = new HashSet<>(musicIds);
             if (musicSet.size() < musicIds.size()) {
-                throw new BizException("不予许添加相同的曲目");
+                throw new BizException("不能添加相同的曲目");
             }
         }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantUnbindHistoryController.java

@@ -12,7 +12,6 @@ import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
 import com.yonge.cooleshow.biz.dal.service.TenantUnbindHistoryService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantUnbindHistoryWrapper;
-import com.yonge.cooleshow.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -28,13 +27,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-
 @Slf4j
 @Validated
 @RestController
 @RequestMapping("${app-config.url.admin:}/tenantUnbindHistory")
 @Api(tags = "机构解绑历史表")
-public class TenantUnbindHistoryController extends BaseController{
+public class TenantUnbindHistoryController {
 
     @Autowired
     private TenantUnbindHistoryService tenantUnbindHistoryService;

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantUnbindRecordController.java

@@ -24,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+
 
 @Slf4j
 @Validated
@@ -35,7 +37,7 @@ public class TenantUnbindRecordController extends BaseController {
     @Autowired
     private TenantUnbindRecordService tenantUnbindRecordService;
 
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
     @Autowired

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/UnbindAuthUserController.java

@@ -14,6 +14,7 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,6 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 @Slf4j
 @Validated
 @RestController
@@ -49,6 +52,11 @@ public class UnbindAuthUserController {
         if (unbindAuthUser.getUserId() == null) {
             throw new BizException("用户ID不能为空");
         }
+
+        List<UnbindAuthUser> list = unbindAuthUserService.list();
+        if (!CollectionUtils.isEmpty(list)) {
+            unbindAuthUser.setId(list.get(0).getId());
+        }
         // 新增数据
         unbindAuthUserService.save(unbindAuthUser);
         

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/open/AdminClient.java

@@ -194,8 +194,8 @@ public class AdminClient extends BaseController {
     public HttpResponseResult<CouponInfoApi> queryCouponOrderPageInfo(@RequestParam Long userId, @RequestParam String issueIds, @RequestParam BigDecimal orderAmount, @RequestParam ClientEnum client) {
 
         List<Long> collect = Arrays.stream(issueIds.split(","))
-                .map(Long::valueOf)
-                .collect(Collectors.toList());
+                                   .map(Long::valueOf)
+                                   .collect(Collectors.toList());
 
         CouponOrderVO.PageRequest request = new CouponOrderVO.PageRequest();
         request.setClientType(client);
@@ -233,12 +233,12 @@ public class AdminClient extends BaseController {
         request.setReset(returnCoupon);
         request.setUseType(CouponCategoryEnum.MALL);
         List<Long> collect = Arrays.stream(couponIssueId.split(","))
-                .map(Long::valueOf)
-                .collect(Collectors.toList());
+                                   .map(Long::valueOf)
+                                   .collect(Collectors.toList());
         request.setIssueIds(collect);
         // 更新受影响优惠券数据
         int ret = couponInfoService.updateUserOrderCouponInfo(CouponOrderWrapper.from(request.jsonString()));
 
         return succeed(ret > 0);
     }
-}
+}

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/open/UserPaymentClient.java

@@ -16,7 +16,6 @@ import com.yeepay.g3.sdk.yop.utils.DigitalEnvelopeUtils;
 import com.yeepay.g3.sdk.yop.utils.RSAKeyUtils;
 import com.yonge.cooleshow.biz.dal.entity.PaymentMerchantConfig;
 import com.yonge.cooleshow.biz.dal.entity.TenantMember;
-import com.yonge.cooleshow.biz.dal.entity.UserOrderRefundBill;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.PaymentMerchantConfigService;
 import com.yonge.cooleshow.biz.dal.service.TenantMemberService;
@@ -153,13 +152,6 @@ public class UserPaymentClient {
         }
         log.info("refund vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
 
-        // 退款订单确认
-        UserOrderRefundBill refundBill = userOrderRefundBillService.getByTransNoOrOrderNo(refundResp.getTransNo(), refundResp.getMerOrderNo());
-        if (Objects.isNull(refundBill)) {
-            log.warn("refund REFUND_FAILED, vendor={}, refundResp={}", vendor, JSON.toJSONString(refundResp));
-            return refundResp.getMsg();
-        }
-
         // 执行退款回调流程
         userPaymentCoreService.refundPaymentCallback(refundResp);
 

cooleshow-app/src/main/java/com/yonge/cooleshow/classroom/controller/HereWhiteController.java

@@ -8,12 +8,11 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 @RestController
-@RequestMapping("${app-config.url.classroom:}/hereWhite")
+@RequestMapping("/hereWhite")
 public class HereWhiteController extends BaseController {
 
     @Autowired
@@ -21,7 +20,7 @@ public class HereWhiteController extends BaseController {
 
     @ApiOperation("创建白板，默认全部采用零时白板")
     @PostMapping(value = "create")
-    public HttpResponseResult<ImNetworkHereWhite> userAdd(@RequestBody HereWhiteDto hereWhiteDto) throws Exception {
+    public HttpResponseResult<ImNetworkHereWhite> userAdd(HereWhiteDto hereWhiteDto) throws Exception {
         return succeed(hereWhiteService.create(hereWhiteDto.getName(), hereWhiteDto.getUserNum(),hereWhiteDto.getCourseScheduleId()));
     }
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/classroom/controller/ImNetworkRoomMemberController.java

@@ -1,28 +0,0 @@
-package com.yonge.cooleshow.classroom.controller;
-
-
-import com.yonge.cooleshow.biz.dal.service.ImNetworkRoomMemberService;
-import com.yonge.cooleshow.common.controller.BaseController;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 网络教室成员(ImNetworkRoomMember)表控制层
- *
- * @author zx
- * @since 2022-03-30 16:36:37
- */
-@Api(tags = "网络教室成员")
-@RestController
-@RequestMapping("${app-config.url.classroom:}/imNetworkRoomMember")
-public class ImNetworkRoomMemberController extends BaseController {
-    /**
-     * 服务对象
-     */
-    @Autowired
-    private ImNetworkRoomMemberService imNetworkRoomMemberService;
-
-}
-

cooleshow-app/src/main/java/com/yonge/cooleshow/classroom/controller/ImNetworkRoomController.java → cooleshow-app/src/main/java/com/yonge/cooleshow/classroom/controller/RoomController.java

@@ -46,9 +46,9 @@ import java.util.Objects;
 @Api(tags = "网络教室房间")
 @RestController
 @RequestMapping("${app-config.url.classroom:}/room")
-public class ImNetworkRoomController extends BaseController {
+public class RoomController extends BaseController {
 
-    private final static Logger log = LoggerFactory.getLogger(ImNetworkRoomController.class);
+    private final static Logger log = LoggerFactory.getLogger(RoomController.class);
     /**
      * 服务对象
      */

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

@@ -5,9 +5,11 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.CourseHomeworkSubmitDto;
 import com.yonge.cooleshow.biz.dal.dto.search.HomeworkSearch;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -51,6 +53,9 @@ public class CourseHomeworkController extends BaseController {
     @Autowired
     private CourseHomeworkService courseHomeworkService;
 
+    @Autowired
+    private ImGroupService imGroupService;
+
 
     @ApiOperation(value = "首页-我的课程-课程详情(陪练课)-课后作业信息详情",notes = "传入课程编号ID")
     @GetMapping(value = "/detail/{courseId}")
@@ -60,7 +65,11 @@ public class CourseHomeworkController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         HttpResponseResult info = checkCourseSchedule(courseId,sysUser);
         if (info != null) return info;
-        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, sysUser.getId()));
+        CourseHomeworkDetailVo detailVo = courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, sysUser.getId());
+        if (detailVo != null) {
+            detailVo.setImUserId(imGroupService.getImUserId(String.valueOf(detailVo.getTeacherId()),ClientEnum.TEACHER.name()));
+        }
+        return succeed(detailVo);
     }
 
     private HttpResponseResult checkCourseSchedule(Long courseId,SysUser sysUser) {
@@ -103,8 +112,7 @@ public class CourseHomeworkController extends BaseController {
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
 
             for (CourseHomeworkVo item : page.getRecords()) {
-
-                item.setImUserId(String.valueOf(item.getTeacherId()));
+                item.setImUserId(imGroupService.getImUserId(String.valueOf(item.getTeacherId()),ClientEnum.TEACHER.name()));
             }
         }
 

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

@@ -25,8 +25,15 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
-
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Objects;
@@ -44,9 +51,9 @@ public class ImGroupController extends BaseController {
     /**
      * 服务对象
      */
-    @Autowired
+    @Resource
     private ImGroupService imGroupService;
-    @Autowired
+    @Resource
     private SysUserService sysUserService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
@@ -100,9 +107,9 @@ public class ImGroupController extends BaseController {
     @ApiOperation("退出群聊")
     @PostMapping(value = "/quit/{groupId}")
     public HttpResponseResult quit(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId,
-                                   @RequestParam(value = "quit",required = false,defaultValue = "true") boolean quit
-    ) throws Exception {
-        imGroupService.quit(groupId,sysUserService.getUserId(), ClientEnum.STUDENT,quit);
+                                   @RequestParam(value = "quit",required = false,defaultValue = "false") boolean quit
+                                   ) throws Exception {
+        imGroupService.quit(groupId,sysUserService.getUserId(), ClientEnum.STUDENT, quit);
         return succeed();
     }
 

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

@@ -10,12 +10,12 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 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 javax.annotation.Resource;
 import javax.validation.Valid;
 
 /**
@@ -29,9 +29,9 @@ import javax.validation.Valid;
 @RequestMapping("${app-config.url.student:}/imGroupMemberAudit")
 public class ImGroupMemberAuditController extends BaseController {
 
-    @Autowired
+    @Resource
     private ImGroupMemberAuditService imGroupMemberAuditService;
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("申请入群")

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

@@ -406,10 +406,15 @@ public class MusicSheetController extends BaseController {
     }
 
 
-
     @ApiOperation(value = "搜索")
     @PostMapping(value="/search")
     public HttpResponseResult<MusicCompareWrapper.SearchData> search(@RequestBody MusicCompareWrapper.MusicSearch queryInfo) {
+
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            throw new BizException("用户信息获取失败");
+        }
+        queryInfo.setUserId(sysUser.getId());
         return succeed(musicSheetService.search(queryInfo));
     }
 
@@ -426,4 +431,5 @@ public class MusicSheetController extends BaseController {
         return succeed(musicSheetService.searchTenant(queryInfo));
     }
 
+
 }

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

@@ -13,8 +13,10 @@ import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.SysUserService;
 import com.yonge.cooleshow.biz.dal.vo.MyFollow;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
+import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 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.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
@@ -25,6 +27,8 @@ import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -168,4 +172,16 @@ public class StudentController extends BaseController {
         return succeed();
     }
 
+
+    @PostMapping("/checkPassword")
+    @ApiOperation(value = "校验密码")
+    public Object checkPassword(@Validated @RequestBody StudentWrapper.StudentUpdatePassword updatePassword){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
+        if(!encoder.matches(updatePassword.getPassword(),sysUser.getPassword())){
+            throw new BizException("原密码错误");
+        }
+        return succeed();
+    }
+
 }

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

@@ -7,7 +7,6 @@ import com.yonge.cooleshow.biz.dal.dto.search.TeacherStyleSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.service.AppVersionInfoService;
-import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.StudentStarService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.service.TeacherStyleVideoService;
@@ -49,9 +48,6 @@ public class TeacherController extends BaseController {
     private StudentStarService studentStarService;
     @Autowired
     private AppVersionInfoService appVersionInfoService;
-    
-    @Autowired
-    private StudentService studentService;
 
     @ApiOperation(value = "老师风采-分页")
     @PostMapping("/stylePage")

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

@@ -65,7 +65,6 @@ public class TenantAlbumSheetController extends BaseController {
         }
         query.setTenantId(Optional.ofNullable(user.getTenantId()).orElse(-1L));
         query.setClientType(ClientEnum.TENANT_STUDENT);
-
         IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));
     }

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

@@ -91,6 +91,28 @@ public class OpenClient extends BaseController {
         return HttpResponseResult.succeed(detail);
     }
 
+
+    @GetMapping("/checkPhone")
+    @ApiOperation(value = "检查手机是否已经是机构学生")
+    public HttpResponseResult<Boolean> checkPhone(String phone) {
+
+
+        // 根据手机号 判断是否已经有机构账户
+        SysUser sysUser = sysUserFeignService.queryUserByMobile(phone);
+        if (sysUser == null) {
+            return HttpResponseResult.succeed(true);
+        }
+        Student student = studentService.getById(sysUser.getId());
+        if (student == null) {
+            return HttpResponseResult.succeed(true);
+        }
+        if (student.getTenantId() ==null || student.getTenantId() == -1) {
+            return HttpResponseResult.succeed(true);
+        } else {
+            return HttpResponseResult.succeed(false);
+        }
+    }
+
     @ApiOperation(value = "绑定老师")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "phone", value = "手机号", required = true, dataType = "String"),
@@ -120,26 +142,6 @@ public class OpenClient extends BaseController {
         return succeed(activityVo);
     }
 
-    @GetMapping("/checkPhone")
-    @ApiOperation(value = "检查手机是否已经是机构学生")
-    public HttpResponseResult<Boolean> checkPhone(String phone) {
-
-
-        // 根据手机号 判断是否已经有机构账户
-        SysUser sysUser = sysUserFeignService.queryUserByMobile(phone);
-        if (sysUser == null) {
-            return HttpResponseResult.succeed(true);
-        }
-        Student student = studentService.getById(sysUser.getId());
-        if (student == null) {
-            return HttpResponseResult.succeed(true);
-        }
-        if (student.getTenantId() ==null || student.getTenantId() == -1) {
-            return HttpResponseResult.succeed(true);
-        } else {
-            return HttpResponseResult.succeed(false);
-        }
-    }
 
 
     @ApiOperation(value = "新增曲谱渲染图")

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

@@ -17,7 +17,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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 javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
@@ -70,4 +75,5 @@ public class UserPaymentClient {
         UserOrderVo detail = userOrderService.detailApp(param);
         return succeed(detail);
     }
+
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/CourseHomeworkController.java

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.CourseScheduleEnum;
 import com.yonge.cooleshow.biz.dal.service.CourseHomeworkService;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.vo.CountVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.CourseHomeworkVo;
@@ -33,7 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,6 +57,9 @@ public class CourseHomeworkController extends BaseController {
     @Autowired
     private CourseHomeworkService courseHomeworkService;
 
+    @Autowired
+    private ImGroupService imGroupService;
+
     @ApiOperation(value = "未布置的课后作业数量")
     @GetMapping(value="/count")
     public HttpResponseResult<CountVo> countTeacherNoDecorateHomework() {
@@ -88,7 +91,12 @@ public class CourseHomeworkController extends BaseController {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         HttpResponseResult info = checkCourseSchedule(courseId,sysUser);
         if (info != null) return info;
-        return succeed(courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, studentId));
+        CourseHomeworkDetailVo detailVo = courseHomeworkService.getCourseHomeworkDetailByCourseId(courseId, studentId);
+        if (detailVo != null) {
+            detailVo.setImUserId(imGroupService.getImUserId(String.valueOf(detailVo.getStudentId()),ClientEnum.STUDENT.name()));
+        }
+
+        return succeed(detailVo);
     }
 
 
@@ -150,8 +158,7 @@ public class CourseHomeworkController extends BaseController {
         if (CollectionUtils.isNotEmpty(page.getRecords())) {
 
             for (CourseHomeworkVo item : page.getRecords()) {
-
-                item.setImUserId(MessageFormat.format("{0}:{1}", String.valueOf(item.getStudentId()), ClientEnum.STUDENT.name()));
+                item.setImUserId(imGroupService.getImUserId(String.valueOf(item.getStudentId()),ClientEnum.STUDENT.name()));
             }
         }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/ImGroupController.java

@@ -24,13 +24,17 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 
 /**
  * 即时通讯群组(ImGroup)表控制层
@@ -70,41 +74,6 @@ public class ImGroupController extends BaseController {
         return succeed();
     }
 
-    @ApiOperation("创建群聊")
-    @PostMapping(value = "/create/v2")
-    public HttpResponseResult createV2(@Valid @RequestBody ImGroupWrapper.ImGroup imGroup, BindingResult bindingResult) throws Exception {
-
-        // 将imUserId 转为userId
-        Set<String> imUserIdList = imGroup.getImUserIdList();
-
-        Set<Long> studentIdList = new HashSet<>();
-        for (String imUserId : imUserIdList) {
-            studentIdList.add(Long.parseLong(imGroupService.analysisImUserId(imUserId)));
-        }
-        imGroup.setStudentIdList(studentIdList);
-
-        ValidationKit.ignoreFields(bindingResult,"id");
-        imGroup.setCreateBy(sysUserService.getUserId());
-        imGroupService.create(imGroup);
-        return succeed();
-    }
-
-    @ApiOperation("添加群成员")
-    @PostMapping(value = "/addGroupMember/v2")
-    public HttpResponseResult addGroupMemberV2(@Valid @RequestBody ImGroupWrapper.ImGroup imGroup,
-                                               BindingResult bindingResult) throws Exception {
-        // 将imUserId 转为userId
-        Set<String> imUserIdList = imGroup.getImUserIdList();
-
-        Set<Long> studentIdList = new HashSet<>();
-        for (String imUserId : imUserIdList) {
-            studentIdList.add(Long.parseLong(imGroupService.analysisImUserId(imUserId)));
-        }
-        imGroup.setStudentIdList(studentIdList);
-
-        imGroupService.addGroupMember(imGroup.getGroupId(), imGroup.getStudentIdList());
-        return succeed();
-    }
     @ApiOperation("解散群聊")
     @PostMapping(value = "/dismiss/{groupId}")
     public HttpResponseResult dismiss(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId) throws Exception {
@@ -115,9 +84,9 @@ public class ImGroupController extends BaseController {
     @ApiOperation("退出群聊")
     @PostMapping(value = "/quit/{groupId}")
     public HttpResponseResult quit(@ApiParam(value = "群编号", required = true) @PathVariable("groupId") String groupId,
-                                   @RequestParam(value = "quit",required = false,defaultValue = "true") boolean quit
-    ) throws Exception {
-        imGroupService.quit(groupId, sysUserService.getUserId(), ClientEnum.TEACHER,quit);
+                                   @RequestParam(value = "quit",required = false, defaultValue = "false") boolean quit
+                                   ) throws Exception {
+        imGroupService.quit(groupId, sysUserService.getUserId(), ClientEnum.TEACHER, quit);
         return succeed();
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/MusicAlbumController.java

@@ -15,7 +15,6 @@ import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
-import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -55,8 +54,8 @@ public class MusicAlbumController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    @Autowired
-    private MusicAlbumService musicAlbumService;
+	@Autowired
+	private MusicAlbumService musicAlbumService;
 
     @Autowired
     private TeacherService teacherService;
@@ -76,16 +75,16 @@ public class MusicAlbumController extends BaseController {
         if (teacher == null) {
             return failed("用户信息获取失败");
         }
-
+        
         if(query.getSubjectIdList() == null || query.getSubjectIdList().size() == 0){
-            List<Long> subjectIdList = new ArrayList<Long>();
-            if(StringUtils.isNotBlank(teacher.getSubjectId())){
-                String[] subjectIds = teacher.getSubjectId().split(",");
-                for(String s : subjectIds){
-                    subjectIdList.add(Long.parseLong(s));
-                }
-                query.setSubjectIdList(subjectIdList);
-            }
+        	List<Long> subjectIdList = new ArrayList<Long>();
+        	if(StringUtils.isNotBlank(teacher.getSubjectId())){
+        		String[] subjectIds = teacher.getSubjectId().split(",");
+        		for(String s : subjectIds){
+                	subjectIdList.add(Long.parseLong(s));
+        		}
+        		query.setSubjectIdList(subjectIdList);
+        	}
         }
 
         // 检查app版本
@@ -126,10 +125,10 @@ public class MusicAlbumController extends BaseController {
         musicAlbumSearch.setAlbumTagIds(albumDetailVo.getAlbumTag());
         IPage<MusicAlbumVo> relatedMusicAlbum = musicAlbumService.selectStudentPage(PageUtil.getPage(musicAlbumSearch),musicAlbumSearch, ClientEnum.TEACHER);
         List<MusicAlbumVo> musicAlbumVos1 = relatedMusicAlbum.getRecords()
-                .stream()
-                .filter(musicAlbumVo -> !musicAlbumVo.getId()
-                        .equals(albumDetailVo.getId()))
-                .collect(Collectors.toList());
+                                                      .stream()
+                                                      .filter(musicAlbumVo -> !musicAlbumVo.getId()
+                                                                                           .equals(albumDetailVo.getId()))
+                                                      .collect(Collectors.toList());
         if (musicAlbumVos1.size() > query.getRelatedNum()) {
             musicAlbumVos1 = musicAlbumVos1.subList(0,query.getRelatedNum());
         }
@@ -140,7 +139,7 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑收藏
      */
-    @PostMapping("/favorite/{id}")
+     @PostMapping("/favorite/{id}")
     @ApiOperation(value = "专辑收藏/取消收藏")
     public HttpResponseResult<Boolean> favorite(@ApiParam(value = "专辑编号", required = true) @PathVariable("id") Long id,
                                                 @ApiParam(value = "客户端类型") @RequestParam(value = "clientType", required = false, defaultValue = "TEACHER") String clientType) {
@@ -149,9 +148,9 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
 
-        if (ClientEnum.invalid(clientType)) {
-            return failed("无效的客户端类型");
-        }
+         if (ClientEnum.invalid(clientType)) {
+             return failed("无效的客户端类型");
+         }
 
         return succeed(musicAlbumService.setFavorite(sysUser.getId(), id, ClientEnum.valueOf(clientType)));
     }
@@ -170,7 +169,7 @@ public class MusicAlbumController extends BaseController {
         StudentMusicAlbumSearch search = new StudentMusicAlbumSearch();
         search.studentId(sysUser.getId())
                 .albumFavorite(true)
-                .setAlbumStatus(YesOrNoEnum.YES);
+                 .setAlbumStatus(YesOrNoEnum.YES);
 
         IPage<MusicAlbumVo> albumVoIPage = musicAlbumService.favoriteAlbum(PageUtil.getPage(query), search, ClientEnum.TEACHER);
         return succeed(PageUtil.pageInfo(albumVoIPage));
@@ -202,20 +201,10 @@ public class MusicAlbumController extends BaseController {
                 .orderStatus(OrderStatusEnum.PAID)
                 .clientType(ClientEnum.TEACHER);
 
-        IPage<MusicAlbumVo> albumVoIPage = musicAlbumService.favoriteAlbum(PageUtil.getPage(query), search, ClientEnum.TEACHER);
+        IPage<MusicAlbumVo> albumVoIPage = musicAlbumService.favoriteAlbum(PageUtil.getPage(query), search,
+                ClientEnum.TEACHER);
         return succeed(PageUtil.pageInfo(albumVoIPage));
     }
 
-    @ApiOperation(value = "查询机构专辑详情")
-    @PostMapping("/albumDetail")
-    public HttpResponseResult <TenantAlbumWrapper.TenantAlbum> albumDetail(@RequestParam(defaultValue = "") String albumId) {
-        TenantAlbumWrapper.TenantAlbum tenantAlbum= musicAlbumService.detailAlbum(albumId);
-        return HttpResponseResult.succeed(tenantAlbum);
-    }
-
-
-
-
-
 
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -239,7 +239,7 @@ public class TeacherController extends BaseController {
         tenantUnbindRecord.setTenantId(user.getTenantId());
         tenantUnbindRecord.setTenantName(tenantInfo == null ? "" : tenantInfo.getName());
         tenantUnbindRecord.setUserId(user.getId());
-        tenantUnbindRecord.setUserName(user.getRealName());
+        tenantUnbindRecord.setUserName(user.getUsername());
         tenantUnbindRecord.setPhone(user.getPhone());
 
         String subjectId = teacher.getSubjectId();

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseScheduleController.java

@@ -15,8 +15,10 @@ import com.yonge.cooleshow.biz.dal.vo.MyCourseVo;
 import com.yonge.cooleshow.biz.dal.vo.PianoRoomTimeVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomePage;
 import com.yonge.cooleshow.biz.dal.vo.TeacherLiveCourseInfoVo;
+import com.yonge.cooleshow.biz.dal.wrapper.course.CourseScheduleWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 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;
@@ -30,10 +32,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -314,5 +318,17 @@ public class TeacherCourseScheduleController extends BaseController {
         }
         return succeed(holidaysFestivalsService.queryByYear(year));
     }
+
+
+    @ApiOperation(value = "获取老师直播课程时间")
+    @GetMapping("/liveCourseScheduleTime")
+    public HttpResponseResult<CourseScheduleWrapper.LiveRoomTime> liveCourseScheduleTime(@RequestParam String roomUid){
+
+        if (Objects.isNull(roomUid)) {
+            throw new BizException("直播编号不能为空");
+        }
+
+        return succeed(courseScheduleService.getLiveCourseScheduleTime(roomUid));
+    }
 }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherLiveRoomController.java

@@ -90,7 +90,7 @@ public class TeacherLiveRoomController extends BaseController {
     @ApiOperation("设置是否允许连麦")
     @GetMapping("/whetherMic")
     public HttpResponseResult<Object> whetherMic(@ApiParam(value = "房间uid", required = true) String roomUid,
-                                                 @ApiParam(value = "是否连麦 0：是 1否", required = true) Integer whetherMic) {
+                                                      @ApiParam(value = "是否连麦 0：是 1否", required = true) Integer whetherMic) {
         liveRoomService.whetherMic(roomUid,whetherMic);
         return succeed();
     }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/TenantAlbumSheetController.java

@@ -49,10 +49,8 @@ public class TenantAlbumSheetController extends BaseController {
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-
         query.setTenantId(Optional.ofNullable(user.getTenantId()).orElse(-1L));
         query.setClientType(ClientEnum.TEACHER);
-
         IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));
     }

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

@@ -27,14 +27,19 @@ public class UserTenantAlbumRecordController {
 
 
     @ApiOperation(value = "查询机构专辑详情")
-    @PostMapping("/detail")
+    @PostMapping("/albumDetail")
     public HttpResponseResult <TenantAlbumWrapper.TenantAlbum> albumDetail(@RequestParam(defaultValue = "") String albumId) {
         TenantAlbumWrapper.TenantAlbum tenantAlbum= musicAlbumService.detailAlbum(albumId);
         return HttpResponseResult.succeed(tenantAlbum);
     }
 
 
-
+    @ApiOperation(value = "查询机构专辑详情")
+    @PostMapping("/detail")
+    public HttpResponseResult <TenantAlbumWrapper.TenantAlbum> detail(@RequestParam(defaultValue = "") String albumId) {
+        TenantAlbumWrapper.TenantAlbum tenantAlbum= musicAlbumService.detailAlbum(albumId);
+        return HttpResponseResult.succeed(tenantAlbum);
+    }
 
 
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/teacher/controller/open/UserPaymentClient.java

@@ -17,7 +17,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+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 javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
@@ -35,6 +40,7 @@ public class UserPaymentClient {
 
     @Autowired
     private UserOrderService userOrderService;
+
     @ApiOperation(value = "用户付款", notes = "用户付款")
     @PostMapping("/executePayment/v2")
     public R<UserPaymentOrderWrapper.PaymentReq> executePayment(@Validated @RequestBody UserPaymentOrderVo.PaymentReqConfig config, HttpServletRequest request) {
@@ -69,4 +75,5 @@ public class UserPaymentClient {
         UserOrderVo detail = userOrderService.detailApp(param);
         return succeed(detail);
     }
+
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/StudentController.java

@@ -2,15 +2,13 @@ package com.yonge.cooleshow.tenant.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
 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.entity.Student;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TenantActivationCode;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
@@ -20,7 +18,6 @@ import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.enums.BizHttpStatus;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.cooleshow.common.enums.UserStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -47,13 +44,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -66,7 +60,7 @@ public class StudentController extends BaseController {
     private StudentService studentService;
     @Autowired
     private TeacherService teacherService;
-    @Resource
+    @Autowired
     private SysUserFeignService sysUserFeignService;
     @Autowired
     private ImUserFriendService imUserFriendService;
@@ -99,7 +93,7 @@ public class StudentController extends BaseController {
         rows.stream().forEach(r->{
             if (StringUtils.isEmpty(r.getRealName())){
                 if (StringUtils.isNotEmpty(r.getUsername()))
-                    r.setRealName(r.getUsername());
+                r.setRealName(r.getUsername());
             }
         });
 
@@ -108,7 +102,7 @@ public class StudentController extends BaseController {
         if (!rows.isEmpty() && query.getTenantAlbumPurchaseId() != null) {
             List<String> studentPhones =
                     rows.stream().map(StudentVo::getPhone).filter(StringUtils::isNotEmpty).collect(Collectors.toList());
-            groupByPhone = tenantActivationCodeService.lambdaQuery()
+             groupByPhone = tenantActivationCodeService.lambdaQuery()
                     .eq(TenantActivationCode::getId, query.getTenantAlbumPurchaseId())
                     .in(TenantActivationCode::getActivationPhone, studentPhones)
                     .list().stream().collect(Collectors.groupingBy(TenantActivationCode::getActivationPhone));
@@ -144,7 +138,7 @@ public class StudentController extends BaseController {
 
         if (studentId == null) {
             SysUser sysUser = sysUserFeignService.queryUserByMobile(student.getPhone());
-            if (sysUser != null) {
+            if (sysUser != null && sysUser.getUserType().contains(ClientEnum.STUDENT.getCode())) {
                 studentId = sysUser.getId();
             }
         }
@@ -164,18 +158,6 @@ public class StudentController extends BaseController {
         }
 
         studentService.save(studentInfo);
-
-        // 加好友
-        SysUser sysUser = sysUserFeignService.queryUserByMobile(student.getPhone());
-        Student newStudent = studentService.getById(sysUser.getId());
-        if (newStudent.getTenantId()!= null && newStudent.getTenantId()!=-1L) {
-            // 自动与机构老师成为好友
-            List<Teacher> teacherList = teacherService.lambdaQuery()
-                    .eq(Teacher::getTenantId, newStudent.getTenantId()).list();
-            teacherList.forEach(next -> imUserFriendService.saveUserFriend(next.getUserId(),
-                    new HashSet<>(ImmutableList.of(sysUser.getId()))));
-        }
-
         return succeed();
     }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -26,21 +26,15 @@ import com.yonge.cooleshow.biz.dal.service.TenantStaffService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.enums.BizHttpStatus;
 import com.yonge.cooleshow.common.enums.EActivationCode;
 import com.yonge.cooleshow.tenant.vo.TenantActivationCodeVo;
-import com.yonge.toolset.utils.date.DateUtil;
-import com.yonge.toolset.utils.easyexcel.ErrMsg;
 import com.yonge.toolset.utils.easyexcel.ExcelDataReader;
-import com.yonge.toolset.utils.easyexcel.ExcelException;
 import com.yonge.toolset.utils.easyexcel.ExcelUtils;
-import com.yonge.toolset.utils.excel.POIUtil;
 import com.yonge.toolset.utils.http.HttpUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -56,7 +50,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.OutputStream;
 import java.text.MessageFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;

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

@@ -109,8 +109,7 @@ public class TenantAlbumController extends BaseController {
 
     private TenantInfo getTenantInfo() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        TenantInfo tenantInfo = tenantInfoService.lambdaQuery().eq(TenantInfo::getUserId, sysUser.getId())
-                .last("limit 1").one();
+        TenantInfo tenantInfo = tenantInfoService.getById(sysUser.getTenantId());
         if (tenantInfo == null) {
             throw new BizException("非法请求");
         }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumPurchaseController.java

@@ -48,9 +48,9 @@ public class TenantAlbumPurchaseController extends BaseController {
 
     @Autowired
     private TenantInfoService tenantInfoService;
-
     @Autowired
     private TenantStaffService tenantStaffService;
+
     @ApiOperation(value = "详情", notes = "机构专辑采购-根据详情ID查询单条, 传入id")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "id", dataType = "long")

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantAlbumSheetController.java

@@ -65,7 +65,6 @@ public class TenantAlbumSheetController extends BaseController {
         }
         query.setTenantId(Optional.ofNullable(user.getTenantId()).orElse(-1L));
         query.setClientType(ClientEnum.TENANT);
-
         IPage<TenantAlbumMusicWrapper.StudentTenantAlbumMusic> page = tenantAlbumMusicService.selectPage(QueryInfo.getPage(query), query);
         return succeed((PageUtil.pageInfo(page)));
     }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -107,7 +107,7 @@ public class TenantInfoController extends BaseController {
     public HttpResponseResult<Boolean> updateTenantInfo(@Valid @RequestBody TenantInfoVo.TenantInfo info) {
 
         TenantInfo tenantInfo = JSON.parseObject(info.jsonString(), TenantInfo.class);
-        tenantInfoService.updateById(tenantInfo);
+            tenantInfoService.updateById(tenantInfo);
 
         return  HttpResponseResult.succeed(true);
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/UserOrderController.java

@@ -209,8 +209,6 @@ public class UserOrderController {
         return succeed(userPaymentCoreService.orderPayType(payTypeReq));
     }
 
-
-
     /**
      * 查询单条
      */
@@ -228,4 +226,6 @@ public class UserOrderController {
         return succeed(detail);
     }
 
+
+
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenStudentController.java

@@ -1,26 +1,19 @@
 package com.yonge.cooleshow.tenant.controller.open;
 
 import com.alibaba.fastjson.JSON;
-import com.google.common.collect.ImmutableList;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.ImGroupMember;
 import com.yonge.cooleshow.biz.dal.entity.Student;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
-import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.ImGroupMemberService;
 import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 import com.yonge.cooleshow.biz.dal.service.ImUserFriendService;
 import com.yonge.cooleshow.biz.dal.service.SmsCodeService;
 import com.yonge.cooleshow.biz.dal.service.StudentService;
-import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
 import com.yonge.cooleshow.biz.dal.wrapper.StudentWrapper;
-import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.tenant.vo.StudentVo;
@@ -39,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 @Slf4j
 @RestController

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenSubjectController.java

@@ -25,39 +25,39 @@ import java.util.stream.Collectors;
 @RestController
 public class OpenSubjectController extends BaseController {
 
-	@Autowired
-	private SubjectService subjectService;
-
-	@ApiOperation(value = "根据声部编号查询声部")
-	@GetMapping("/get/{id}")
-	public Object get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
-		return succeed(subjectService.get(id));
-	}
-
-	@ApiOperation(value = "分页查询声部树状列表")
-	@PostMapping("/queryPageTree")
-	public HttpResponseResult<PageInfo<Subject>> queryPageTree(@RequestBody SubjectQueryInfo queryInfo) {
-		return succeed(subjectService.queryPageTree(queryInfo));
-	}
-
-	@ApiOperation(value = "分页查询声部列表")
-	@GetMapping("/queryPage")
-	public HttpResponseResult<PageInfo<Subject>> queryPage(SubjectQueryInfo queryInfo) {
-		PageInfo<Subject> pageInfo = subjectService.queryPage(queryInfo);
-
-		if (pageInfo.getRows().size() == 0) {
-			return succeed(pageInfo);
-		}
-
-		Map<Long, Subject> map =
-				subjectService.findBySubjectByIdList(pageInfo.getRows().stream().map(Subject::getParentSubjectId).collect(Collectors.toList())).stream()
-						.collect(Collectors.toMap(Subject::getId, t -> t));
-
-		pageInfo.getRows().forEach(row -> {
-			if (row.getParentSubjectId() != null && row.getParentSubjectId() > 0) {
-				row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
-			}
-		});
-		return succeed(pageInfo);
-	}
+    @Autowired
+    private SubjectService subjectService;
+
+    @ApiOperation(value = "根据声部编号查询声部")
+    @GetMapping("/get/{id}")
+    public Object get(@ApiParam(value = "声部编号", required = true) @PathVariable("id") Long id) {
+        return succeed(subjectService.get(id));
+    }
+
+    @ApiOperation(value = "分页查询声部树状列表")
+    @PostMapping("/queryPageTree")
+    public HttpResponseResult<PageInfo<Subject>> queryPageTree(@RequestBody SubjectQueryInfo queryInfo) {
+        return succeed(subjectService.queryPageTree(queryInfo));
+    }
+
+    @ApiOperation(value = "分页查询声部列表")
+    @GetMapping("/queryPage")
+    public HttpResponseResult<PageInfo<Subject>> queryPage(SubjectQueryInfo queryInfo) {
+        PageInfo<Subject> pageInfo = subjectService.queryPage(queryInfo);
+
+        if (pageInfo.getRows().size() == 0) {
+            return succeed(pageInfo);
+        }
+
+        Map<Long, Subject> map =
+                subjectService.findBySubjectByIdList(pageInfo.getRows().stream().map(Subject::getParentSubjectId).collect(Collectors.toList())).stream()
+                .collect(Collectors.toMap(Subject::getId, t -> t));
+
+        pageInfo.getRows().forEach(row -> {
+            if (row.getParentSubjectId() != null && row.getParentSubjectId() > 0) {
+                row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
+            }
+        });
+        return succeed(pageInfo);
+    }
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTenantController.java

@@ -63,6 +63,8 @@ public class OpenTenantController {
         return HttpResponseResult.status(true);
     }
 
+
+
     @GetMapping("/checkPhone")
     @ApiOperation(value = "检查手机是否已经注册机构账户")
     public HttpResponseResult<Boolean> checkPhone(String phone) {
@@ -124,7 +126,7 @@ public class OpenTenantController {
         } else {
             // 判断当前账号是否已绑定
             if (StringUtils.isNotBlank(tenantStaff.getWxOpenid()) && !openId.equals(tenantStaff.getWxOpenid())) {
-                throw new BizException("当前账号已绑定");
+                throw new BizException("请登录您所绑定的机构");
             }
         }
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/vo/TenantActivationCodeVo.java

@@ -35,6 +35,26 @@ public class TenantActivationCodeVo {
         private List<Long> studentIdList = new ArrayList<>();
     }
 
+
+    @Data
+    @ApiModel(" TenantActivationCodeSend-机构激活码重发")
+    public static class TenantActivationCodeResend {
+
+
+        @ApiModelProperty("专辑购买记录的ID")
+        @NotNull(message = "专辑购买记录的ID不能为空")
+        private Long tenantAlbumPurchaseId;
+
+        @ApiModelProperty("激活码")
+        @NotBlank(message = "激活码不能为空")
+        private String code;
+
+        @ApiModelProperty("用户ID")
+        @NotNull(message = "用户ID不能为空")
+        private Long userId;
+    }
+
+
     @Data
     @ApiModel(" TenantActivationCode-机构激活码")
     public static class TenantActivationCode {
@@ -97,22 +117,4 @@ public class TenantActivationCodeVo {
         }
     }
 
-
-    @Data
-    @ApiModel(" TenantActivationCodeSend-机构激活码重发")
-    public static class TenantActivationCodeResend {
-
-
-        @ApiModelProperty("专辑购买记录的ID")
-        @NotNull(message = "专辑购买记录的ID不能为空")
-        private Long tenantAlbumPurchaseId;
-
-        @ApiModelProperty("激活码")
-        @NotBlank(message = "激活码不能为空")
-        private String code;
-
-        @ApiModelProperty("用户ID")
-        @NotNull(message = "用户ID不能为空")
-        private Long userId;
-    }
 }

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/vo/UserPaymentOrderVo.java

@@ -192,7 +192,7 @@ public class UserPaymentOrderVo {
     @ApiModel("订单支付参数配置")
     public static class PaymentReqConfig implements Serializable {
 
-        @ApiModelProperty("支付厂商")
+        @ApiModelProperty("支付三方")
         private String paymentVendor;
 
         @ApiModelProperty("支付渠道")