|
@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
|
|
import java.util.*;
|
|
import java.util.*;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.fs.course.mapper.FsUserCoursePeriodDaysMapper;
|
|
import com.fs.course.mapper.FsUserCoursePeriodDaysMapper;
|
|
import com.fs.store.mapper.FsUserMapper;
|
|
import com.fs.store.mapper.FsUserMapper;
|
|
@@ -161,11 +162,14 @@ public class FsUserWatchCourseStatisticsServiceImpl extends ServiceImpl<FsUserWa
|
|
if(userTotalDataList != null && !userTotalDataList.isEmpty()){
|
|
if(userTotalDataList != null && !userTotalDataList.isEmpty()){
|
|
// 获取过滤时间后的销售会员数量
|
|
// 获取过滤时间后的销售会员数量
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
|
|
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 =0;
|
|
|
|
+ int newUserNum =0;
|
|
|
|
+ if (ObjectUtil.isNotEmpty(data.getCourseStartDateTime())){
|
|
|
|
+ userNum = userTotalDataList.stream()
|
|
|
|
+ .filter(v -> v.getUserCreateDate().before(data.getCourseStartDateTime())).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
|
|
|
|
+ newUserNum = userTotalDataList.stream()
|
|
|
|
+ .filter(v -> sdf.format(v.getUserCreateDate()).equals(sdf.format(data.getCourseStartDateTime()))).mapToInt(FsUserWatchCourseStatistics::getUserNum).sum();
|
|
|
|
+ }
|
|
vo.setUserNum(userNum);
|
|
vo.setUserNum(userNum);
|
|
vo.setNewUserNum(newUserNum);
|
|
vo.setNewUserNum(newUserNum);
|
|
} else {
|
|
} else {
|