提交：BUG处理

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseSectionWatchPerServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -96,13 +97,13 @@ public class CourseSectionWatchPerServiceImpl extends ServiceImpl<CourseSectionW
     public CheckSectionWatchVo checkSectionWatchPer(SectionWatchQueryBo bo) {
         //校验商品有效期
         Goods goods = goodsService.getById(bo.getGoodsId());
-//        if (ObjectUtils.isNotNull(goods.getValidityStartTime()) && ObjectUtils.isNotNull(goods.getValidityEndTime())){
-//            Long validityStartTime = goods.getValidityStartTime();
-//            Long validityEndTime = goods.getValidityEndTime();
-//            if (System.currentTimeMillis() < validityStartTime || System.currentTimeMillis() > validityEndTime){
-//                throw new CustomException("该商品不在有效期");
-//            }
-//        }
+        if (ObjectUtils.isNotNull(goods.getValidityStartTime()) && ObjectUtils.isNotNull(goods.getValidityEndTime())){
+            Long validityStartTime = goods.getValidityStartTime();
+            Long validityEndTime = goods.getValidityEndTime();
+            if (DateUtils.getNowTime() < validityStartTime || DateUtils.getNowTime() > validityEndTime){
+                throw new CustomException("该商品不在有效期");
+            }
+        }
         CheckSectionWatchVo watchVo = new CheckSectionWatchVo();
         watchVo.setGoodsId(bo.getGoodsId());
         watchVo.setCourseId(bo.getCourseId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserStudyRecordServiceImpl.java

@@ -663,38 +663,24 @@ public class UserStudyRecordServiceImpl extends ServiceImpl<UserStudyRecordMappe
                 //开通课程和未开通课程人数
                 Map<Integer, List<UserStudyRecord>> buyMap = recordList.stream().filter(x -> ObjectUtils.isNotNull(x.getBuyCourse())).collect(Collectors.groupingBy(UserStudyRecord::getBuyCourse));
                 if (CollectionUtils.isNotEmpty(buyMap)){
-                    buyMap.forEach((k,v) -> {
-                        switch (k){
-                            case 0://未开通课程
-                                Map<Long, List<UserStudyRecord>> collect = buyMap.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
-                                item.setUnBuyCourseNumber(collect.keySet().size());
-                                break;
-                            case 1://开通课程
-                                Map<Long, List<UserStudyRecord>> records = buyMap.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
-                                item.setBuyCourseNumber(records.keySet().size());
-                                break;
-                            default:
-                                break;
-                        }
-                    });
+                    //开通课程
+                    Map<Long, List<UserStudyRecord>> records = buyMap.get(1).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
+                    Set<Long> buyCourseUserIds = records.keySet();
+                    item.setBuyCourseNumber(buyCourseUserIds.size());
+                    //未开通课程
+                    Map<Long, List<UserStudyRecord>> collect = buyMap.get(0).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
+                    List<Long> unBuyCourseUserIds = collect.keySet().stream().filter(x -> !buyCourseUserIds.contains(x)).collect(Collectors.toList());
+                    item.setUnBuyCourseNumber(CollectionUtils.isNotEmpty(unBuyCourseUserIds)?unBuyCourseUserIds.size():0);
+
                 }
                 Map<String, List<UserStudyRecord>> collect = recordList.stream().filter(x -> ObjectUtils.isNotNull(x.getFromPlat())).collect(Collectors.groupingBy(UserStudyRecord::getFromPlat));
                 if (CollectionUtils.isNotEmpty(collect)) {
-                    collect.forEach((k, v) -> {
-                        switch (k){
-                            case "1"://小程序
-                                Map<Long, List<UserStudyRecord>> rListMap = collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
-                                item.setAppWatchNumber(rListMap.keySet().size());
-                                break;
-                            case "2"://PC
-//                                collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId))
-                                Map<Long, List<UserStudyRecord>> records = collect.get(k).stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
-                                item.setAdminWatchNumber(records.keySet().size());
-                                break;
-                            default:
-                                break;
-                        }
-                    });
+                    //小程序
+                    Map<Long, List<UserStudyRecord>> rListMap = collect.get("1").stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
+                    item.setAppWatchNumber(rListMap.keySet().size());
+                    //PC
+                    Map<Long, List<UserStudyRecord>> records = collect.get("2").stream().filter(x -> ObjectUtils.isNotNull(x.getUserId())).collect(Collectors.groupingBy(UserStudyRecord::getUserId));
+                    item.setAdminWatchNumber(records.keySet().size());
                 }
             }
         });