fs-service/src/main/java/com/fs/course/service/impl/FsUserWatchCourseStatisticsServiceImpl.java

@@ -168,10 +168,24 @@ public class FsUserWatchCourseStatisticsServiceImpl extends ServiceImpl<FsUserWa
                     // 获取过滤时间后的销售会员数量
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
 
+//                    int userNum = userTotalDataList.stream()
+//                            .filter(v -> v.getUserCreateDate().before(data.getCourseStartDateTime())).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
+//                    int newUserNum = userTotalDataList.stream()
+//                            .filter(v -> sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()))).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
                     int userNum = userTotalDataList.stream()
-                            .filter(v -> v.getUserCreateDate().before(data.getCourseStartDateTime())).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
+                            .filter(v -> {
+                                if (v.getUserCreateDate() == null || data.getCourseStartDateTime() == null || v.getUserNum() == null){
+                                    return false;
+                                }
+                                return v.getUserCreateDate().before(data.getCourseStartDateTime());
+                            }).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
                     int newUserNum = userTotalDataList.stream()
-                            .filter(v -> sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()))).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
+                            .filter(v -> {
+                                if (v.getUserCreateDate() == null || data.getCourseStartDateTime() == null || v.getUserNum() == null){
+                                    return false;
+                                }
+                                return sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()));
+                            }).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
                     vo.setUserNum(userNum);
                     vo.setNewUserNum(newUserNum);
                 } else {