Merge branch 'dev_v1.3.6_20221021' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.6_20221021

# Conflicts:
#	service.md

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

@@ -1212,13 +1212,13 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         MusicSheetDetailVo musicSheet = detail(musicSheetId, null, null);
 
         YesOrNoEnum discount = YesOrNoEnum.NO;
-        if (ChargeTypeEnum.VIP.equals(musicSheet.getChargeType())) {
+        if (musicSheet.getPaymentType().contains(ChargeTypeEnum.VIP.getCode())) {
             ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.VIP, sysUser.getId());
             if (activityPlanVo != null) {
                 result.setActivityId(activityPlanVo.getId());
                 discount = YesOrNoEnum.YES;
             }
-        } else if (ChargeTypeEnum.CHARGE.equals(musicSheet.getChargeType())) {
+        } else if (musicSheet.getPaymentType().contains(ChargeTypeEnum.CHARGE.getCode())) {
             ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.MUSIC_SHEET,
                                                                               sysUser.getId());
             if (activityPlanVo != null) {

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

@@ -30,7 +30,7 @@ public class StudentController extends BaseController {
 
         Long userId = null;
         String[] split = rongCloudUserId.split(":");
-        if (split.length != 2 || StringUtil.isEmpty(split[0])) {
+        if (split.length == 2 && !StringUtil.isEmpty(split[0])) {
             try {
                 userId = Long.parseLong(split[0]);
             } catch (Exception e) {