Merge branch 'feature/0626-live' into develop-new

cooleshow-common/src/main/java/com/yonge/cooleshow/common/constant/SysConfigConstant.java

@@ -434,4 +434,9 @@ public interface SysConfigConstant {
      * 草稿保存时长
      */
     String USER_MUSIC_DRAFT_TIME = "user_music_draft_time";
+
+    /**
+     * 管乐迷和酷乐秀同时直播老师ID
+     */
+    String LIVE_TEACHER_IDS = "live_teacher_ids";
 }

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

@@ -230,6 +230,14 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
     @Override
     public String getImUserId(String userId, String clientType) {
         String imUserId = userId;
+
+        if (StringUtils.isNotBlank(clientType) && clientType.equals(ClientEnum.TEACHER.name())) {
+            String teacherIds = sysConfigService.findConfigValue(SysConfigConstant.LIVE_TEACHER_IDS);
+            if (StringUtils.isNotBlank(teacherIds) && Arrays.asList(teacherIds.split(",")).contains(userId)) {
+                return userId;
+            }
+        }
+
         if (StringUtils.isNotBlank(imConfig.getAppPrefix()) && !userId.startsWith(imConfig.getAppPrefix())) {
             imUserId = MessageFormat.format("{0}_{1}_{2}", imConfig.getAppPrefix(), userId, clientType);
         }
@@ -286,6 +294,11 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
      */
     @Override
     public boolean checkImUserId(String imUserId) {
+
+        String teacherIds = sysConfigService.findConfigValue(SysConfigConstant.LIVE_TEACHER_IDS);
+        if (StringUtils.isNotBlank(teacherIds) && Arrays.asList(teacherIds.split(",")).contains(imUserId)) {
+            return true;
+        }
        return imUserId.startsWith(imConfig.getAppPrefix());
     }
 

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

@@ -353,7 +353,11 @@ public class LiveRoomServiceImpl extends ServiceImpl<LiveRoomDao, LiveRoom> impl
             return;
         }
         LiveRoom room = new LiveRoom();
-        room.setRoomUid(GenRoomUid.apply(c.getTeacherId(), en));
+        if (StringUtils.isBlank(c.getRoomUid())) {
+            room.setRoomUid(GenRoomUid.apply(c.getTeacherId(), en));
+        } else {
+            room.setRoomUid(c.getRoomUid());
+        }
         room.setRoomTitle(titleMap.get(c.getCourseGroupId()));
         room.setLiveRemark(remarkMap.get(c.getCourseGroupId()));
         room.setSpeakerId(c.getTeacherId());

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

@@ -604,7 +604,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             // 计算优惠券金额
             if (StringUtils.isNotEmpty(orderReq.getCouponId())) {
                 if (createRes.getSourceType() != null && !createRes.getSourceType().equals(SourceTypeEnum.PLATFORM)) {
-                    return HttpResponseResult.failed("优惠券不可用");
+                    throw new BizException("优惠券不可用");
                 }
 
                 couponOrderWrapper = couponInfoService.queryUserOrderCouponInfo(orderReq.getUserId(),

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

@@ -11,7 +11,7 @@
 		<result column="lesson_subject_" property="lessonSubject" />
 		<result column="lesson_desc_" property="lessonDesc" />
 		<result column="lesson_price_" property="lessonPrice" />
-		<result column="pay_tpye_" property="payType" />
+		<result column="pay_type_" property="payType" />
 		<result column="lesson_cover_url_" property="lessonCoverUrl" />
 		<result column="teacher_id_" property="teacherId" />
 		<result column="lesson_count_" property="lessonCount" />

toolset/toolset-payment/src/main/java/com/yonge/toolset/payment/util/DistributedLock.java

@@ -189,7 +189,7 @@ public class DistributedLock {
         } catch (BizException e) {
             throw e;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("error",e);
             throw new RuntimeException("任务执行异常");
         } finally {
             unlock(lock);