Merge branch 'feature/0529-live' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupStudentMapperDao.java

@@ -478,4 +478,6 @@ public interface ClassGroupStudentMapperDao extends BaseDAO<Long, ClassGroupStud
     Integer countByUserIdsAndClassIds(@Param("studentIds") String studentIds, @Param("oldClassId") Integer oldClassId);
     
     List<VipGroupClassGroupMapper> queryWaitCancelVipGroup();
+
+    List<ClassGroupStudentMapper> findByVipGroups(@Param("groupIds") List<Long> groupIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupDao.java

@@ -276,7 +276,7 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @author Joburgess
      * @date 2019/11/13
      */
-    List<VipGroup> findNoCreateSuccessVipGroup(Integer tenantId);
+    List<VipGroup> findNoCreateSuccessVipGroup(@Param("tenantId") Integer tenantId, @Param("groupType") String groupType);
 
 
     /**
@@ -385,4 +385,14 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
      * @return int
      */
     int getCourseStudentNumsByGroupId(@Param("groupId") Long groupId);
+
+    /**
+    * @description: 更新直播课学员人数
+     * @param groupId
+     * @param userId
+    * @return void
+    * @author zx
+    * @date 2023/6/2 18:30
+    */
+    void updateStudentIdList(@Param("groupId") Long groupId, @Param("userId") Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/ImLiveBroadcastRoomService.java

@@ -42,6 +42,14 @@ public interface ImLiveBroadcastRoomService extends IService<ImLiveBroadcastRoom
      */
     ImLiveBroadcastRoomVo visitorRoomInfo(String roomUid, Integer userId);
 
+    /**
+     * 直播间配置信息
+     * @param room ImLiveBroadcastRoomVo
+     * @param sysUser SysUser
+     * @return ImLiveBroadcastRoomVo
+     */
+    ImLiveBroadcastRoomVo getLiveBroadcastRoomConfig(ImLiveBroadcastRoomVo room, SysUser sysUser);
+
     ImLiveBroadcastRoomVo queryRoomInfo(String roomUid);
 
     void add(ImLiveBroadcastRoomDto dto);

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -440,4 +440,13 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      * @param id 直播课程组id
      */
     VipGroupApplyDto liveGroupDetail(Long id);
+
+    /**
+    * @description: 给缴费到期的直播课程排课
+     * @param
+    * @return void
+    * @author zx
+    * @date 2023/6/2 18:03
+    */
+    void createLiveCourse();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -283,17 +283,11 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     }
 
     public ImLiveBroadcastRoomVo queryRoomAndCheck(ImLiveBroadcastRoomVo room, SysUser sysUser) {
+
         //直播间信息校验
         if (!room.getTenantId().equals(sysUser.getTenantId())) {
             throw new BizException("您不是该直播机构人员,不可观看!");
         }
-        if (room.getRoomState() == 1) {
-            throw new BizException("直播间不存在");
-        }
-        if (room.getLiveState() == 0) {
-            Date liveStartTime = DateUtil.addMinutes(room.getLiveStartTime(), -PRE_LIVE_TIME_MINUTE);
-            throw new BizException(DateUtil.format(liveStartTime, "yyyy年MM月dd日 HH点mm分") + " 可进入直播间准备");
-        }
         if (room.getLiveState() == 2) {
             //如果直播结束了还是推广状态则将推广修改为取消
             if (room.getPopularize() == 1) {
@@ -303,6 +297,27 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             }
             throw new BizException("直播已结束！");
         }
+
+        if (room.getRoomState() == 1) {
+            throw new BizException("直播间不存在");
+        }
+        if (room.getLiveState() == 0) {
+            Date liveStartTime = DateUtil.addMinutes(room.getLiveStartTime(), -PRE_LIVE_TIME_MINUTE);
+            throw new BizException(DateUtil.format(liveStartTime, "yyyy年MM月dd日 HH点mm分") + " 可进入直播间准备");
+        }
+
+        return getLiveBroadcastRoomConfig(room, sysUser);
+    }
+
+    /**
+     * 直播间配置信息
+     * @param room ImLiveBroadcastRoomVo
+     * @param sysUser SysUser
+     * @return ImLiveBroadcastRoomVo
+     */
+    @Override
+    public ImLiveBroadcastRoomVo getLiveBroadcastRoomConfig(ImLiveBroadcastRoomVo room, SysUser sysUser) {
+
         room.setBlacklistFlag(0);
         //黑名单查询-查询当前用户是否在黑名单中
         int count = imLiveRoomBlackService.count(Wrappers.<ImLiveRoomBlack>lambdaQuery()
@@ -324,7 +339,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         // 直播房间统计信息
         getRoomData(room);
 
-
         // 直播间配置信息
         return room.userSig(userSig).liveRoomConfig(pluginService.getLiveRoomConfig());
     }
@@ -2246,12 +2260,15 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                     pluginService.rtcRoomRecordStart(recordStart);
                 }
 
-                // imFeignService.createLiveRoom(room.getRoomUid(), room.getRoomTitle());
-                //推送预约直播间消息
-                imLiveRoomReservationService.push(room);
+                // 直播间类型: NORMAL, LIVE
+                if (room.getGroupType().equals("NORMAL")) {
+                    // imFeignService.createLiveRoom(room.getRoomUid(), room.getRoomTitle());
+                    //推送预约直播间消息
+                    imLiveRoomReservationService.push(room);
 
-                //推送直播开始消息
-                this.sendRoomLiveState(sysUser, room, MessageTypeEnum.JIGUANG_LIVE_STARTED);
+                    //推送直播开始消息
+                    this.sendRoomLiveState(sysUser, room, MessageTypeEnum.JIGUANG_LIVE_STARTED);
+                }
 
                 // 查询黑名单人员
                 List<ImLiveRoomBlack> blackList = imLiveRoomBlackService.lambdaQuery()

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -551,7 +551,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         }else {
             if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单
                 studentRegistrationService.updateApplyOrder(order);
-            } else if (order.getType().equals(OrderTypeEnum.SMALL_CLASS_TO_BUY)) {
+            } else if (order.getType().equals(OrderTypeEnum.SMALL_CLASS_TO_BUY) || order.getType().equals(OrderTypeEnum.LIVE_GROUP_BUY)) {
                 vipGroupService.orderCallback(order);
             } else if (order.getType().equals(OrderTypeEnum.RENEW) || order.getType().equals(OrderTypeEnum.ADD_STUDENT)) {
                 musicGroupService.renewForCallback(order);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -2647,6 +2647,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         imGroupMemberService.join(classGroup.getId().toString(), userRoleMap);
                         imUserFriendService.refreshGroupImUserFriend(classGroup.getMusicGroupId(), classGroup.getGroupType());
                     }
+                    //更新所属分部列表
+                    List<Integer> organIds = classGroupDao.findStudentOrganIdsByClassGroup(classGroup.getId().longValue());
+                    organIds.add(vipGroup.getOrganId());
+                    HashSet<Integer> hashSet = new HashSet<>(organIds);
+                    String organIdsString = StringUtils.join(hashSet, ",");
+                    vipGroup.setOrganIdList(organIdsString);
+                    vipGroupDao.update(vipGroup);
+                }else {
+                    vipGroupDao.updateStudentIdList(vipGroup.getId(),userId);
                 }
                 SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(userId);
                 //插入缴费明细
@@ -2685,14 +2694,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 map.put(userId, userId.toString());
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, messageTypeEnum, map, null, 0, "2", "STUDENT",
                         vipGroup.getName());
-
-                //更新所属分部列表
-                List<Integer> organIds = classGroupDao.findStudentOrganIdsByClassGroup(classGroup.getId().longValue());
-                organIds.add(vipGroup.getOrganId());
-                HashSet<Integer> hashSet = new HashSet<>(organIds);
-                String organIdsString = StringUtils.join(hashSet, ",");
-                vipGroup.setOrganIdList(organIdsString);
-                vipGroupDao.update(vipGroup);
                 try {
                     contractService.transferVipGroupCoursesContract(userId, vipGroup.getId(), order.getType());
                 } catch (Exception e) {
@@ -4227,27 +4228,53 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void stopVipGroupWithNoCreate(Integer tenantId) {
-        List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup(tenantId);
+        List<VipGroup> noCreateSuccessVipGroups = vipGroupDao.findNoCreateSuccessVipGroup(tenantId,null);
         if (CollectionUtils.isEmpty(noCreateSuccessVipGroups)) {
             return;
         }
+//        List<VipGroup> vipGroup = noCreateSuccessVipGroups.stream().filter(e -> StringUtils.equals("VIP",e.getGroupType())).collect(Collectors.toList());
+//        List<VipGroup> liveGroup = noCreateSuccessVipGroups.stream().filter(e -> StringUtils.equals("LIVE",e.getGroupType())).collect(Collectors.toList());
+//        List<VipGroup> noStudentGroup = vipGroups.stream().filter(e -> StringUtils.isEmpty(e.getStudentIdList())).collect(Collectors.toList());
+//        List<VipGroup> hasStudentGroup = vipGroups.stream().filter(e -> StringUtils.isNotEmpty(e.getStudentIdList())).collect(Collectors.toList());
+//        if(!CollectionUtils.isEmpty(noStudentGroup)){
+//            关闭课程组
+//        }
+//        if(!CollectionUtils.isEmpty(hasStudentGroup)){
+//            排课
+//        }
         //用户账户资金变动信息列表
         List<SysUserCashAccountDetail> userCashAccountDetails = new ArrayList<>();
+        List<Long> groupIds = noCreateSuccessVipGroups.stream().map(e -> e.getId()).collect(Collectors.toList());
+        List<ClassGroupStudentMapper> classGroupStudentMappers = classGroupStudentMapperDao.findByVipGroups(groupIds);
+        Map<Long, Integer> quitUserMap = new HashMap<>();
+        if(!CollectionUtils.isEmpty(classGroupStudentMappers)){
+            quitUserMap = classGroupStudentMappers.stream().collect(Collectors.groupingBy(e -> Long.parseLong(e.getMusicGroupId()), Collectors.collectingAndThen(Collectors.toList(), v -> v.get(0).getUserId())));
+        }
         for (VipGroup noCreateSuccessVipGroup : noCreateSuccessVipGroups) {
-            int i = courseScheduleStudentPaymentDao.countStudentCourseNumWithGroup(GroupType.VIP, noCreateSuccessVipGroup.getId().toString());
+            GroupType groupType = GroupType.VIP;
+            OrderTypeEnum orderTypeEnum = OrderTypeEnum.SMALL_CLASS_TO_BUY;
+            if("LIVE".equals(noCreateSuccessVipGroup.getGroupType())){
+                groupType = GroupType.LIVE;
+                orderTypeEnum = OrderTypeEnum.LIVE_GROUP_BUY;
+            }
+            int i = courseScheduleStudentPaymentDao.countStudentCourseNumWithGroup(groupType, noCreateSuccessVipGroup.getId().toString());
             if (i > 0) {
                 continue;
             }
             noCreateSuccessVipGroup.setStatus(VipGroupStatusEnum.CANCEL);
             List<StudentPaymentOrder> studentPaymentOrders = studentPaymentOrderDao.queryByDealStatus(noCreateSuccessVipGroup.getId().toString(),
-                    OrderTypeEnum.SMALL_CLASS_TO_BUY, DealStatusEnum.SUCCESS);
+                    orderTypeEnum, DealStatusEnum.SUCCESS);
 
             for (StudentPaymentOrder studentPaymentOrder : studentPaymentOrders) {
+                if(studentPaymentOrder.getUserId().equals(quitUserMap.get(noCreateSuccessVipGroup.getId()))){
+
+                }
                 //生成账户资金明细
                 if (studentPaymentOrder.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
                     if(Objects.equals("关闭订单,实际支付成功,退到用户余额",studentPaymentOrder.getMemo())){
                         continue;
                     }
+                    //是否退课
                     sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getExpectAmount());
                     SysUserCashAccount sysUserCashAccount = sysUserCashAccountService.get(studentPaymentOrder.getUserId());
                     SysUserCashAccountDetail sysUserIncomeCashAccountDetail = new SysUserCashAccountDetail();
@@ -4485,4 +4512,21 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         return vipGroupApplyDto;
 
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void createLiveCourse() {
+        List<VipGroup> vipGroups = vipGroupDao.findNoCreateSuccessVipGroup(null,"LIVE");
+        if(!CollectionUtils.isEmpty(vipGroups)){
+            List<VipGroup> noStudentGroup = vipGroups.stream().filter(e -> StringUtils.isEmpty(e.getStudentIdList())).collect(Collectors.toList());
+            List<VipGroup> hasStudentGroup = vipGroups.stream().filter(e -> StringUtils.isNotEmpty(e.getStudentIdList())).collect(Collectors.toList());
+            if(!CollectionUtils.isEmpty(noStudentGroup)){
+                //关闭课程组
+
+            }
+            if(!CollectionUtils.isEmpty(hasStudentGroup)){
+                //排课
+            }
+        }
+    }
 }

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -718,4 +718,12 @@
 		WHERE cgsm.group_type_ = 'VIP' and vg.group_status_ in (2,6) and cg.del_flag_ != 1 GROUP BY cgsm.class_group_id_
 		) a WHERE a.total_student_num_ = a.quit_student_num_
     </select>
+    <select id="findByVipGroups" resultMap="ClassGroupStudentMapper">
+        select * from class_group_student_mapper
+        where music_group_id_ IN
+        <foreach collection="groupIds" separator="," open="(" close=")" item="groupId">
+            #{groupId}
+        </foreach>
+        and group_type_ IN ('VIP','LIVE') and status_ = 'QUIT'
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -179,7 +179,8 @@
         cs.tenant_id_,
         cs.evaluate_flag_,
         cs.service_provider_,
-        cs.mute_all_
+        cs.mute_all_,
+        cs.live_room_id_
     </sql>
 
     <sql id="courseIgnore">

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -571,8 +571,7 @@
         SELECT *
         FROM student_payment_order
         WHERE music_group_id_ = #{musicGroupId}
-          AND type_ =
-              #{type}
+          AND type_ = #{type}
           AND status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
     </select>
 

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -912,7 +912,10 @@
             OR courses_start_date < NOW())
           AND group_status_ = 1 
           <if test="tenantId != null">
-          and tenant_id_ = #{tenantId}
+            and tenant_id_ = #{tenantId}
+          </if>
+          <if test="groupType != null and groupType != ''">
+            and group_type_ = #{groupType}
           </if>
     </select>
 
@@ -1035,6 +1038,11 @@
             WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
         </foreach>
     </update>
+    <update id="updateStudentIdList">
+        update vip_group set student_id_list_ = CASE WHEN student_id_list_ IS NULL OR student_id_list_ = ''
+            THEN #{userId} ELSE CONCAT(student_id_list_,',',#{userId}) END,update_time_ = NOW()
+        where id_ = #{groupId}
+    </update>
 
     <select id="queryRequiredOverList" resultMap="VipGroup">
         SELECT

mec-im/src/main/java/com/ym/controller/RoomController.java

@@ -34,7 +34,7 @@ public class RoomController{
 
     @RequestMapping(value = "/joinLive", method = RequestMethod.POST)
     public BaseResponse joinLiveRoom(@RequestBody ReqUserData data) throws Exception {
-        return new BaseResponse(roomService.joinRoom(data.getRoomId(), false));
+        return roomService.joinRoom(data.getRoomId(), false);
     }
 
     @ApiOperation("查询网络教室信息")

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -320,8 +320,10 @@ public class RoomServiceImpl implements RoomService {
             }
 
             // 返回直播间配置参数
-            roomResult.setLiveRoom(imLiveBroadcastRoomService.visitorRoomInfo(liveRoom.getRoomUid(), sysUser.getId())
-                            .autoCloseNetworkRoomTime(roomResult.getAutoCloseNetworkRoomTime())
+            ImLiveBroadcastRoomVo roomVo = JSON.parseObject(JSON.toJSONString(liveRoom), ImLiveBroadcastRoomVo.class);
+
+            roomResult.setLiveRoom(imLiveBroadcastRoomService.getLiveBroadcastRoomConfig(roomVo, sysUser)
+                    .autoCloseNetworkRoomTime(roomResult.getAutoCloseNetworkRoomTime())
                     .surplusTime(roomResult.getSurplusTime()));
 
             // 主动触发用户加入直播间
@@ -371,10 +373,10 @@ public class RoomServiceImpl implements RoomService {
             liveRoom.setServiceProvider(liveClient);
         }
 
-        String roomUid = "LIVE-" + roomId + "-" + DateTime.now().toDate().getTime();
+        String roomUid = "LIVE-" + roomId + "-" + courseSchedule.getCreateTime().getTime();
         liveRoom.setTenantId(TenantContextHolder.getTenantId());
         liveRoom.setRoomUid(roomUid);
-        liveRoom.setRoomConfig(JSONObject.toJSONString(liveRoom.getRoomConfig()));
+        //liveRoom.setRoomConfig(liveRoom.getRoomConfig());
         liveRoom.setLiveState(1);
         liveRoom.setRoomState(0);
         liveRoom.setGroupType("LIVE");
@@ -390,10 +392,7 @@ public class RoomServiceImpl implements RoomService {
         imLiveBroadcastRoomService.createLiveRoom(liveRoom);
 
         // 返回直播间信息
-        return imLiveBroadcastRoomService.lambdaQuery()
-                .eq(ImLiveBroadcastRoom::getRoomUid, courseSchedule.getLiveRoomId())
-                .last("LIMIT 1")
-                .one();
+        return liveRoom;
     }
 
     /**

mec-web/src/main/java/com/ym/mec/web/controller/TaskController.java

@@ -631,7 +631,7 @@ public class TaskController extends BaseController {
 		//修改训练营状态
         tempLittleArtistTrainingCampService.checkCampState();
 		//直播课排课
-
+		vipGroupService.createLiveCourse();
     }
 
     @ApiOperation("统计老师课程云教练使用时长")