Merge branch 'saas_2022_05_17_activity' into master_saas

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

@@ -473,6 +473,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
     //获取该直播间所有数据写入数据库-并清理缓存
     private void insertAndCleanLiveData(String roomUid, Integer speakerId) {
+        log.info("insertAndCleanLiveData >>>> roomUid : {}", roomUid);
         Date now = new Date();
         //总观看人数
         List<ImLiveBroadcastRoomMember> memberList = new ArrayList<>();
@@ -507,6 +508,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (speakerCache.isExists()) {
             ImLiveBroadcastRoomData liveData = new ImLiveBroadcastRoomData();
             RoomSpeakerInfo speakerInfo = speakerCache.get();
+            log.info("insertAndCleanLiveData >>>> speakerInfo : {}", JSONObject.toJSONString(speakerInfo));
             liveData.setTenantId(speakerInfo.getTenantId());
             liveData.setRoomUid(roomUid);
             liveData.setLikeNum(like);
@@ -1191,17 +1193,20 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
      * @param nowMinutes 现在观看时长
      */
     private int getLookMinutes(Date startDT, Date endDT, Integer nowMinutes) {
+        if (Objects.isNull(nowMinutes)) {
+            nowMinutes = 0;
+        }
         if (Objects.isNull(startDT)) {
-            return 0;
+            return nowMinutes;
         }
         if (startDT.getTime() > endDT.getTime()) {
-            return 0;
+            return nowMinutes;
         }
         //课程结束时间-课程开始时间
         long durationTime = endDT.getTime() - startDT.getTime();
         //相差多少分钟
         int minutesBetween = new Long(durationTime / 1000 / 60).intValue();
-        minutesBetween += Objects.isNull(nowMinutes) ? 0 : nowMinutes;
+        minutesBetween += nowMinutes;
         return Math.max(minutesBetween, 0);
     }
 

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

@@ -445,7 +445,9 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         SysUser user = getUser();
         //查询训练营人员关系
         TempLittleArtistTrainingCampUserRelation campUser = tempLittleArtistTrainingCampUserRelationService.getOne(Wrappers.<TempLittleArtistTrainingCampUserRelation>lambdaQuery()
-                .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId()));
+                .eq(TempLittleArtistTrainingCampUserRelation::getUserId, user.getId())
+                .eq(TempLittleArtistTrainingCampUserRelation::getState, TempLittleArtistTrainingCampUserRelation.APPLY)
+        );
         if (Objects.isNull(campUser)) {
             return null;
         }
@@ -456,12 +458,12 @@ public class TempLittleArtistTrainingCampServiceImpl extends ServiceImpl<TempLit
         if (Objects.isNull(camp)) {
             return null;
         }
-
+        LocalDate now = LocalDate.now();
         TempCampUserTrainingPlayTimeVo vo = new TempCampUserTrainingPlayTimeVo();
         Map<String, Object> param = new HashMap<>();
         param.put("userId", user.getId());
-        param.put("startTime", DateUtil.dateToString(camp.getTrainStartDate()) + " 00:00:00");
-        param.put("endTime", DateUtil.dateToString(camp.getTrainEndDate()) + " 23:59:59");
+        param.put("startTime", now + " 00:00:00");
+        param.put("endTime", now + " 23:59:59");
         Integer playTime = baseMapper.queryUserTrainingPlayTime(param);
         vo.setPlayTime(playTime);
         vo.setTrainStartDate(camp.getTrainStartDate());