change 3 жил өмнө
parent
commit
2861eabe6f
13 өөрчлөгдсөн 63 нэмэгдсэн , 22 устгасан
  1. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java
  2. 8 8
      zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java
  3. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java
  4. 3 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleChapterServiceImpl.java
  5. 7 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java
  6. 4 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java
  7. 1 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java
  8. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformUserServiceImpl.java
  9. 2 0
      zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java
  10. 1 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java
  11. 4 1
      zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java
  12. 16 5
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java
  13. 11 6
      zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ProfileTpServiceImpl.java

@@ -159,6 +159,7 @@ public class ProfileTpServiceImpl extends ServiceImpl<ProfileTpMapper, ProfileTp
 
     @Override
     public ProfileTpVo queryByGoodsId(Long goodsId) {
+        //查询该商品的资料模板字段
         ProfileTpQueryBo profileTpQueryBo = new ProfileTpQueryBo();
         profileTpQueryBo.setGoodsId(goodsId);
         List<ProfileTpVo> profileTpVos = profileTpMapper.selectList(profileTpQueryBo);

+ 8 - 8
zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -159,6 +159,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     public Boolean updateByEditBo(UserProfileEditBo bo) {
         UserProfileVo userProfileVo = this.queryById(bo.getId());
 
+        //新增待审的资料填写
         UserProfile addProfile = BeanUtil.toBean(bo,UserProfile.class);
         addProfile.setCreateTime(DateUtils.getNowTime());
         addProfile.setUpdateTime(DateUtils.getNowTime());
@@ -167,7 +168,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         addProfile.setLastTime(DateUtils.getNowTime());
         addProfile.setCurrentStatus(1L);
         addProfile.setChangeStatus(2);
-
+        //将之前填写的改为过去状态
         UserProfile update = new UserProfile();
         update.setId(bo.getId());
         update.setCurrentStatus(2L);
@@ -202,10 +203,10 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         UserProfileVo info = baseMapper.getInfo(userProfileQueryBo);
         //第一种方式
         Map<String, String> maps = JSONObject.parseObject(info.getKeyValue(),Map.class);
-        //默认配置就够用了
+
  /*       TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig("templates", TemplateConfig.ResourceMode.CLASSPATH));
         Template template = engine.getTemplate("word.ftl");*/
-        //给STRING_TEMPLATE绑定数据
+        //给模板绑定数据
         Calendar rightNow= Calendar.getInstance();
         Map<String, Object> bindingMap = new HashMap<>();
         bindingMap.put("name", JSONObject.parseObject(String.valueOf(maps.get("name")), UserProfileFit.class).getValue());
@@ -225,10 +226,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         bindingMap.put("time", JSONObject.parseObject(String.valueOf(maps.get("graduation_time")), UserProfileFit.class).getValue());
         bindingMap.put("year", JSONObject.parseObject(String.valueOf(maps.get("working_years")), UserProfileFit.class).getValue());
         File touch = FileUtil.touch(ZHONGZHENG_PROFILE+"word.html");
-        //最终渲染出来的样子
-        /*template.render(bindingMap,touch);*/
-
-
+        //默认配置
         Configuration configuration = new Configuration();
         configuration.setDefaultEncoding("UTF-8");
         configuration.setClassForTemplateLoading(this.getClass(), "/templates");
@@ -242,6 +240,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         } catch (TemplateException | freemarker.template.TemplateException e) {
             e.printStackTrace();
         }
+        //将模板输出为图片
         final Java2DRenderer renderer = new Java2DRenderer(touch, 1000, 1000);
         final BufferedImage img = renderer.getImage();
         final FSImageWriter imageWriter = new FSImageWriter();
@@ -254,6 +253,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
                 ContentType.APPLICATION_OCTET_STREAM.toString(), fileInputStream);
         ossRequest.setFile(multipartFile);
         ossRequest.setImageStatus(6);
+        //上传阿里云
         String upload = ossService.upload(ossRequest);
         return upload;
     }
@@ -464,7 +464,7 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
     }
 
     /**
-     * 远程读取image转换为Base64字符串
+     * url读取image转换为Base64字符串
      *
      * @param imgUrl
      * @return

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseMenuServiceImpl.java

@@ -173,6 +173,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         List<CourseUserMenuVo> courseMenuVos = baseMapper.menuList(bo);
         if (bo.getUserId() != null) {
             for (CourseUserMenuVo courseMenuVo : courseMenuVos) {
+                //为节的时候查询重修情况,和是否已学习
                 if (courseMenuVo.getType().equals(3)) {
                     Integer rebuild = baseMapper.rebuildCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
                     if (rebuild > 0) {
@@ -183,12 +184,14 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
                         courseMenuVo.setLearning(1L);
                     }
                 }
+                //为章的时候查询重修情况
                 if (courseMenuVo.getType().equals(2)){
                     Integer rebuild = baseMapper.rebuildChapterCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
                     if (rebuild > 0) {
                         courseMenuVo.setRebuild(1);
                     }
                 }
+                //为模块的时候查询重修情况
                 if (courseMenuVo.getType().equals(1)){
                     Integer rebuild = baseMapper.rebuildModuleCheck(courseMenuVo.getMenuId(), courseMenuVo.getGradeId(), bo.getUserId());
                     if (rebuild > 0) {

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseModuleChapterServiceImpl.java

@@ -107,11 +107,13 @@ public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChap
     @Override
     public List<CourseUserModuleChapterVo> chapterList(CourseMenuQueryBo bo) {
         List<CourseUserModuleChapterVo> courseUserModuleChapterVos = baseMapper.chapterList(bo);
+        //获得重修目录
         if (bo.getRebuild() != null && bo.getRebuild() == 1){
             for (CourseUserModuleChapterVo courseUserModuleChapterVo : courseUserModuleChapterVos) {
                 if (courseUserModuleChapterVo.getModuleId() == null){
                     bo.setModuleId(0L);
                 }
+                //查询章是否重修章
                 Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),courseUserModuleChapterVo.getChapterId(), courseUserModuleChapterVo.getGradeId(), bo.getUserId());
                 if (rebuild > 0) {
                     courseUserModuleChapterVo.setRebuild(1);
@@ -120,6 +122,7 @@ public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChap
             List<CourseUserModuleChapterVo> courseUserModuleChapterVoList = courseUserModuleChapterVos.stream().filter(s ->
                     s.getRebuild() != null && s.getRebuild().equals(1)
             ).collect(Collectors.toList());
+            //返回重修的目录
             return courseUserModuleChapterVoList;
         }
         return courseUserModuleChapterVos;

+ 7 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -93,8 +93,10 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public Long rebuildNext(ClassGradeUserQueryBo bo) {
+        //查询未确认的作弊的节
         Long aLong = baseMapper.rebuildNext(bo);
         Long rebuild =2L;
+        //y有就改为 1 未确认
         if (aLong > 0){
             rebuild = 1L;
         }
@@ -235,6 +237,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<GoodsPeriodStatusVo> listSection(ClassGradeUserQueryBo bo) {
+        //查询作弊的详细情况
         List<GoodsPeriodStatusVo> goodsPeriodStatusVos = baseMapper.listSection(bo);
         for (GoodsPeriodStatusVo goodsPeriodStatusVo : goodsPeriodStatusVos) {
             LambdaQueryWrapper<UserStudyRecordPhoto> lqw = Wrappers.lambdaQuery();
@@ -247,6 +250,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean editRebuild(ClassGradeUserQueryBo bo) {
+        //将该班级下的学员作弊的节改成待重修
         List<GoodsPeriodStatusVo> goodsPeriodStatusVos = baseMapper.listSection(bo);
         for (GoodsPeriodStatusVo goodsPeriodStatusVo : goodsPeriodStatusVos) {
             UserPeriodStatus userPeriodStatus = new UserPeriodStatus();
@@ -268,6 +272,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
     @Override
     public List<GoodsUserVo> goodsList(CourseQueryBo bo) {
         List<GoodsUserVo> goodsUserVos = baseMapper.goodsList(bo);
+        //用户课程得详细信息
         for (GoodsUserVo goodsUserVo : goodsUserVos) {
             //获得当前所在班级
             Long gradeId = baseMapper.gradeIdSelect(goodsUserVo.getUserId(),goodsUserVo.getGoodsId());
@@ -291,7 +296,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
 
     @Override
     public List<CourseUserVo> courseList(CourseQueryBo bo) {
-        List<CourseUserVo> courseUserVos = baseMapper.courseList(bo);
+        List<CourseUserVo> courseUserVos = baseMapper.courseList(bo);、
+        //课程下学员的学习记录
         for (CourseUserVo courseUserVo : courseUserVos) {
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();
             subjectStudyRecordQueryBo.setGoodsId(bo.getGoodsId());

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamApplyServiceImpl.java

@@ -214,6 +214,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
 
     @Override
     public Long subscribeNext(ExamApplyQueryBo bo) {
+        //查看是否有无考试记录
         Integer countHaveSubscribeNext = baseMapper.countHaveSubscribeNext(bo);
         if (bo.getApplyStatus().equals(2) && countHaveSubscribeNext < 1){
             throw new IllegalArgumentException("系统检索到您不符合【补考学员】的报名条件,请重新选择!");
@@ -226,6 +227,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
         if (residueSubscribeNext == null || residueSubscribeNext < 1){
             return 3L;
         }
+        //查询有无考培
         Integer beforeSubscribeNext = baseMapper.beforeSubscribeNext(bo);
         if (beforeSubscribeNext > 0){
             return 1L;
@@ -235,6 +237,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
 
     @Override
     public List<ExamUserApplySiteVo> subscribeApplySite(ExamApplyQueryBo bo) {
+        //查看地址
         List<ExamUserApplySiteVo> examUserApplySiteVos= baseMapper.subscribeApplySite(bo);
         //获得详细地址查看是否满员
         for (ExamUserApplySiteVo examUserApplySiteVo : examUserApplySiteVos) {
@@ -255,6 +258,7 @@ public class ExamApplyServiceImpl extends ServiceImpl<ExamApplyMapper, ExamApply
 
     @Override
     public List<ExamUserApplySiteVo> subscribeApplySiteTrain(ExamApplyQueryBo bo) {
+        //查看地址
         List<ExamUserApplySiteVo> examUserApplySiteVos= baseMapper.subscribeApplySiteTrain(bo);
         //获得详细地址查看是否满员
         for (ExamUserApplySiteVo examUserApplySiteVo : examUserApplySiteVos) {

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/service/impl/ExamBeforeServiceImpl.java

@@ -164,6 +164,7 @@ public class ExamBeforeServiceImpl extends ServiceImpl<ExamBeforeMapper, ExamBef
 
     @Override
     public ExamBeforeVo getAddressInfo(ExamBeforeQueryBo examBeforeQueryBo) {
+        //查询该商品是否有前培设置
         Long verLong = baseMapper.verifyInfo(examBeforeQueryBo.getGoodsId());
         if (verLong < 1){
             throw new IllegalArgumentException("您不符合考前刷题条件,请先预约考试,或者咨询相关工作人员,了解使用条件。");

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformUserServiceImpl.java

@@ -87,12 +87,14 @@ public class InformUserServiceImpl extends ServiceImpl<InformUserMapper, InformU
         lqw.orderByDesc(InformUser::getSendTime);
         List<InformUserVo> informUserVos = entity2Vo(this.list(lqw));
         for (InformUserVo informUserVo : informUserVos) {
+            //为教务通知获得课程和题库
             if (informUserVo.getSystemStatus() == 2) {
                 InformVo informVo = informService.queryById(informUserVo.getInformId());
                 informVo.setInformExamVo(iInformExamService.queryExam(informVo.getInformId()));
                 informVo.setInformCourseVo(iInformCourseService.queryCourse(informVo.getInformId()));
                 informUserVo.setInformVo(informVo);
             }
+            //获得该学员此商品的班级
             if(informUserVo.getGoodsId() != null && informUserVo.getGradeId() == null){
                 Long gradeId = baseMapper.selectGradeId(informUserVo.getGoodsId(),bo.getUserId());
                 informUserVo.setGradeId(gradeId);

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -453,9 +453,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Override
     public List<OrderListVo> selectListApp(OrderQueryBo bo) {
         List<OrderListVo> orderListVos = orderMapper.selectListApp(bo);
+        //订单和订单商品子父联级
         for (OrderListVo orderListVo : orderListVos) {
             OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();
             orderGoodsQueryBo.setOrderSn(orderListVo.getOrderSn());
+            //订单下的订单商品
             List<OrderGoodsVo> list = iOrderGoodsService.selectList(orderGoodsQueryBo);
             BigDecimal totalPrice = new BigDecimal("0");
             for (OrderGoodsVo orderGoodsVo : list) {

+ 1 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java

@@ -230,7 +230,7 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
     }
 
     @Override
-    public List<PolyvCataData> queryCataList(PolyvVideoQueryBo bo) throws Exception {
+    public synchronized List<PolyvCataData> queryCataList(PolyvVideoQueryBo bo) throws Exception {
         //获得保利威sign
         Long ptime = System.currentTimeMillis();
         Map<String,String> map = new HashMap<>();

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -270,6 +270,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 }
             }
         }
+        //同步用户购买商品的考试次数和前培次数
         sendGoods();
         return "请求成功";
     }
@@ -302,7 +303,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
     public void updateExamSend(UserQueryBo bo) {
         //新考预约提醒
         sendExamSubscribe();
-
+        //课程到期提醒
         sendClassEnd();
     }
 
@@ -467,6 +468,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
 
     @Override
     public void timeSend(UserQueryBo bo) {
+        //提醒考试
         List<UserSubscribeVo> userSubscribeVo = iUserSubscribeService.timeSend();
         InformRemindVo informRemindVo = informRemindService.queryById(16L);
         for (UserSubscribeVo subscribeVo : userSubscribeVo) {
@@ -548,6 +550,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
 
     @Override
     public void updateIssue(UserQueryBo bo) throws ParseException {
+        //预约考试提醒
         InformQueryBo informQueryBo = new InformQueryBo();
         informQueryBo.setIssue(1);
         informQueryBo.setIssueStatus(2);

+ 16 - 5
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserPlanServiceImpl.java

@@ -124,6 +124,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             userPlanVo.setPitchNum(userPlan.getPitchNum());
             userPlanVo.setStudyNum(userPlan.getStudyNum());
             userPlanVo.setPlanId(userPlan.getPlanId());
+            //查询计划绑定的商品
             List<GoodsUserVo> goodsVos = userPlanGoodsService.selectGoods(userPlanVo.getPlanId(),userPlanVo.getUserId());
             userPlanVo.setGoodsVos(goodsVos);
             // List转成数组
@@ -198,11 +199,11 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         c1.setTime(dateTwo);
         //设置为当月最后一天
         c1.set(Calendar.DAY_OF_MONTH, c1.getActualMaximum(Calendar.DAY_OF_MONTH));
-        System.out.println(c.getTimeInMillis());
-        System.out.println(c1.getTimeInMillis());
-
+        //获得学习时间范围的日历
         List<CalendarStudyVo> clCalendarStudyVos = findDates(c.getTimeInMillis()/1000,c1.getTimeInMillis()/1000);
+        //所有商品总节数
         Long secAll = 0L;
+        //当前商品总节数
         Long sumUp = 0L;
         for (Long aLong : bo.getGoodsId()) {
             //最近考试时间七天前到现在的天数,学习视频时长
@@ -212,6 +213,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             if (dutyDays < 1){
                 throw new IllegalArgumentException("没有学习天数,请认真填写开始结束时间");
             }
+            //查询商品每个课程得总节数
             List<Long> seLongs = baseMapper.selectGoods(aLong);
             Long allNum = 0L;
             for (Long seLong : seLongs) {
@@ -221,6 +223,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             //计算每天需要学习多少节课
             int Sec = (int) Math.ceil((double) allNum / dutyDays);
             secAll+=Sec;
+            //给大于等于今天的天数赋值学习节数
             for (CalendarStudyVo clCalendarStudyVo : clCalendarStudyVos) {
                 for (DayStudyVo dayStudyVo : clCalendarStudyVo.getDayStudyList()) {
                     if (Arrays.asList(bo.getStudyCount()).contains(dayStudyVo.getStudyDay())){
@@ -229,10 +232,11 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                         }
                         Calendar c5 = Calendar.getInstance();
                         c.setTime(new Date(bo.getStartTime()));
+                        //小于今天直接下一次循环
                         if (dayStudyVo.getDate() < c5.get(Calendar.DAY_OF_MONTH) && clCalendarStudyVo.getMonth() == (c5.get(Calendar.MONTH) + 1) && clCalendarStudyVo.getYear() == (c5.get(Calendar.YEAR))){
                             continue;
                         }
-
+                        //未赋值过,赋值,赋值过增加
                         if (dayStudyVo.getStudyCourseKnob() != null) {
                             if (allNum < Sec) {
                                 dayStudyVo.setStudyCourseKnob(dayStudyVo.getStudyCourseKnob() + allNum);
@@ -254,6 +258,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                         }
                         DaySectionVo daySectionVo = new DaySectionVo();
                         daySectionVo.setGoodsId(aLong);
+                        //小于学习节数,直接加上剩余学习节数
                         if (allNum < Sec) {
                             daySectionVo.setStudyGoodsKnob(Convert.toLong(allNum));
                         } else{
@@ -333,9 +338,11 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
         c1.set(Calendar.DAY_OF_MONTH, c1.getActualMaximum(Calendar.DAY_OF_MONTH));
         System.out.println(c.getTimeInMillis());
         System.out.println(c1.getTimeInMillis());
-
+        //获得学习时间范围的日历
         List<CalendarStudyVo> clCalendarStudyVos = findDates(c.getTimeInMillis()/1000,c1.getTimeInMillis()/1000);
+        //所有商品总节数
         Long secAll = 0L;
+        //当前商品总节数
         Long sumUp = 0L;
         for (Long aLong : bo.getGoodsId()) {
             //最近考试时间七天前到现在的天数,学习视频时长
@@ -345,6 +352,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             if (dutyDays < 1){
                 throw new IllegalArgumentException("没有学习天数,请认真填写开始结束时间");
             }
+            //查询每个商品的总节数
             List<Long> seLongs = baseMapper.selectGoods(aLong);
             Long allNum = 0L;
             for (Long seLong : seLongs) {
@@ -362,6 +370,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
                         }
                         Calendar c5 = Calendar.getInstance();
                         c.setTime(new Date(bo.getStartTime()));
+                        //给大于等于今天的天数赋值学习节数,小于跳过
                         if (dayStudyVo.getDate() < c5.get(Calendar.DAY_OF_MONTH) && clCalendarStudyVo.getMonth() == (c5.get(Calendar.MONTH) + 1) && clCalendarStudyVo.getYear() == (c5.get(Calendar.YEAR))){
                             continue;
                         }
@@ -679,7 +688,9 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
             cal2.set(Calendar.DAY_OF_WEEK, cal.getActualMaximum(Calendar.DAY_OF_WEEK));
             cal2.add(Calendar.DAY_OF_WEEK, 1);
             Long timeInMillis = cal2.getTimeInMillis() / 1000;
+            //获得七天的日历
             List<CalendarStudyVo> sevenDates = findSevenDates(timeInMillisStart, timeInMillis);
+            //查找七天日历的学习计划
             for (CalendarStudyVo sevenDate : sevenDates) {
                 for (DayStudyVo dayStudyVo : sevenDate.getDayStudyList()) {
                     List<CalendarStudyVo> collect = calendarStudyVos.stream().filter(CalendarStudyVo -> CalendarStudyVo.getMonth().equals(sevenDate.getMonth())).collect(Collectors.toList());

+ 11 - 6
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -303,20 +303,25 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     public Boolean updateByEditSingleBo(UserAppSubscribeEditBo bo) {
         UserSubscribe update = BeanUtil.toBean(bo, UserSubscribe.class);
         validEntityBeforeSave(update);
+        //时间是否已过
+        update.setUpdateTime(DateUtils.getNowTime());
+        UserSubscribeVo userSubscribeVo = this.queryById(update.getSubscribeId());
+        ExamApplyVo examApplyVo = examApplyMapper.selectByApply(userSubscribeVo.getApplyId());
+        if (examApplyVo.getApplyEndTime() < System.currentTimeMillis()/1000){
+            throw new IllegalArgumentException("不可取消预约");
+        }
+
+        //用户取消预约考试发送消息
         if (bo.getSubscribeStatus() != null && bo.getSubscribeStatus().equals(2)) {
             UserSubscribeEditBo userSubscribeEditBo = new UserSubscribeEditBo();
             Long[] s = new Long[]{
                     bo.getSubscribeId()
             };
             userSubscribeEditBo.setSubscribeId(s);
+            //发送消息
             sendExamcancel(userSubscribeEditBo);
         }
-        update.setUpdateTime(DateUtils.getNowTime());
-        UserSubscribeVo userSubscribeVo = this.queryById(update.getSubscribeId());
-        ExamApplyVo examApplyVo = examApplyMapper.selectByApply(userSubscribeVo.getApplyId());
-        if (examApplyVo.getApplyEndTime() < System.currentTimeMillis()/1000){
-            throw new IllegalArgumentException("不可取消预约");
-        }
+
         return this.updateById(update);
     }