Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -793,11 +793,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 }
             }
         }
-        //经过上面的判断得知clientIp相同，在继续校验主讲人是否在线，如果在线则不允许退出
-        if (imFeignService.checkOnline(userid)) {
-            return true;
-        }
-
         //主讲人退出房间关闭录像
         closeLive(speakerInfo);
         speakerInfo.setExitRoomTime(now);
@@ -1144,7 +1139,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
      * 测试
      */
     public Map<String, Object> test(String roomUid) {
-//        destroyExpiredLiveRoom();
         //test
         Map<String, Object> result = new HashMap<>();
         //校验房间心跳是否过期没续租
@@ -1183,12 +1177,12 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (CollectionUtils.isNotEmpty(totalUserInfo)) {
             if (CollectionUtils.isNotEmpty(inRoomUserInfo)) {
                 look = inRoomUserInfo.size();
-                result.put("正在观看的人员信息", inRoomUserInfo);
+//                result.put("正在观看的人员信息", inRoomUserInfo);
             } else {
                 result.put("正在观看的人员信息", "没有正在观看的人员数据");
             }
             totalLook = totalUserInfo.size();
-            result.put("总人员数据", totalUserInfo);
+//            result.put("总人员数据", totalUserInfo);
         } else {
             result.put("总人员数据", "没有人员数据");
         }

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

@@ -630,19 +630,19 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
             cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
             cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId()));
-
+            //赠送陪练课
+            ActivityUserMapper activityUserMapper = new ActivityUserMapper();
+            activityUserMapper.setTeacherId(student.getTeacherId());
+            activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
+            activityUserMapper.setUserId(studentPaymentOrder.getUserId());
+            activityUserMapper.setActivityId(activity.getId());
+            activityUserMapper.setActualPrice(BigDecimal.ZERO);
+            activityUserMapper.setGivePracticeFlag(1);
+            activityUserMapper.setReturnFee(false);
             //如果是买的商品1那么赠送陪练课和训练营
             if(Objects.equals(studentPaymentOrder.getClassGroupId(),1)){
                 //赠送陪练课
-                ActivityUserMapper activityUserMapper = new ActivityUserMapper();
-                activityUserMapper.setTeacherId(student.getTeacherId());
-                activityUserMapper.setPaymentOrderId(studentPaymentOrder.getId());
-                activityUserMapper.setUserId(studentPaymentOrder.getUserId());
-                activityUserMapper.setActivityId(activity.getId());
-                activityUserMapper.setActualPrice(BigDecimal.ZERO);
                 activityUserMapper.setGivePracticeFlag(1);
-                activityUserMapper.setReturnFee(false);
-                activityUserMapperDao.insert(activityUserMapper);
                 //赠送训练营
                 TempLittleArtistTrainingCampUserRelation tempLittleArtistTrainingCamp = new TempLittleArtistTrainingCampUserRelation();
                 tempLittleArtistTrainingCamp.setUserId(studentPaymentOrder.getUserId());
@@ -650,6 +650,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 tempLittleArtistTrainingCamp.setCreateTime(nowDate);
                 tempLittleArtistTrainingCampUserRelationDao.insert(tempLittleArtistTrainingCamp);
             }
+            activityUserMapperDao.insert(activityUserMapper);
             //生成订单详情
             StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
             studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());