|
|
@@ -771,8 +771,10 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
|
|
|
Map<Long,FsCourseWatchLogStatisticsListVO> redAmountMap = fsCourseRedPacketLogMapper.selectFsCourseRedPacketLogByQwUserIdList(param);
|
|
|
statisticsListVOS.forEach(vo ->{
|
|
|
FsCourseWatchLogStatisticsListVO statisticsListVO = redAmountMap.get(vo.getQwUserId());
|
|
|
- if(vo.getQwUserId().equals(statisticsListVO.getQwUserId()) && vo.getCreateTime().equals(statisticsListVO.getCreateTime())){
|
|
|
- vo.setRedAmount(statisticsListVO.getRedAmount());
|
|
|
+ if(statisticsListVO != null){
|
|
|
+ if(statisticsListVO.getQwUserId().equals(vo.getQwUserId()) && statisticsListVO.getCreateTime().equals(vo.getCreateTime())){
|
|
|
+ vo.setRedAmount(statisticsListVO.getRedAmount());
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
return statisticsListVOS;
|