submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -27,9 +28,12 @@ import com.zhongzheng.modules.course.service.ICourseMenuService;
 import com.zhongzheng.modules.course.service.ICourseSectionService;
 import com.zhongzheng.modules.course.vo.CourseLiveVo;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.exam.bo.ExamApplySiteTimeTwoAddBo;
+import com.zhongzheng.modules.exam.domain.ExamApplySiteTime;
 import com.zhongzheng.modules.exam.domain.ExamApplyUser;
 import com.zhongzheng.modules.exam.domain.ExamBefore;
 import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
+import com.zhongzheng.modules.exam.service.IExamApplySiteTimeService;
 import com.zhongzheng.modules.exam.service.IExamApplyUserService;
 import com.zhongzheng.modules.exam.service.IExamBeforeService;
 import com.zhongzheng.modules.exam.vo.ExamApplyGoodsVo;
@@ -132,6 +136,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
     @Autowired
     private IUserSubscribeService iUserSubscribeService;
 
+    @Autowired
+    private IExamApplySiteTimeService iExamApplySiteTimeService;
+
     @Autowired
     private ICourseMenuService courseMenuService;
 
@@ -662,6 +669,8 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                                 .last("limit 1"));
                         if (ObjectUtils.isNull(subscribe)){
                             goodsVo.setSubscribeSign(1);
+                        }else if (userSubscribe.getSubscribeStatus() == 1 && userSubscribe.getExamStatus() == 0){
+                            goodsVo.setSubscribeSign(4);
                         }else if (ObjectUtils.isNotNull(subscribe.getResult()) && subscribe.getResult() == 0){
                             goodsVo.setSubscribeSign(3);
                         }
@@ -670,6 +679,26 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                     List<ExamApplyGoodsVo> examApplyGoodsVos = new ArrayList<>();
                     List<ExamApplyGoodsVo> examApplyGoodsVos2 = new ArrayList<>();
                     examApplyGoodsVoList.forEach(examApplyGoodsVo -> {
+                        List<ExamApplySiteTime> siteTimes = iExamApplySiteTimeService.list(new LambdaQueryWrapper<ExamApplySiteTime>()
+                                .eq(ExamApplySiteTime::getApplyId, examApplyGoodsVo.getApplyId()));
+                        if (CollectionUtils.isNotEmpty(siteTimes)){
+                            ExamApplySiteTime timeTime = siteTimes.get(0);
+                            List<ExamApplySiteTimeTwoAddBo> siteTimeTwoAddBos = JSONArray.parseArray(timeTime.getSiteTime(), ExamApplySiteTimeTwoAddBo.class);
+                            ExamApplySiteTimeTwoAddBo twoAddBo = siteTimeTwoAddBos.get(0);
+                            if (ObjectUtils.isNotNull(twoAddBo)){
+                                Long time = timeTime.getExamTime()+28800L;
+                                String format = String.format("%s-%s", twoAddBo.getStartTime(), twoAddBo.getEndTime());
+                                examApplyGoodsVo.setApplyTime(time);
+                                examApplyGoodsVo.setApplyMoment(format);
+                                examApplyGoodsVo.setApplyNum(twoAddBo.getNum().intValue());
+                                //预约人数
+                                int count = iUserSubscribeService.count(new LambdaQueryWrapper<UserSubscribe>()
+                                        .eq(UserSubscribe::getSubscribeStatus, 1)
+                                        .eq(UserSubscribe::getExamStatus, 0)
+                                        .eq(UserSubscribe::getApplyId, examApplyGoodsVo.getApplyId()));
+                                examApplyGoodsVo.setSubscribeNum(count);
+                            }
+                        }
                         LambdaQueryWrapper<ExamApplyUser> lqw = Wrappers.lambdaQuery();
                         lqw.eq(ExamApplyUser::getApplyId, examApplyGoodsVo.getApplyId());
                         List<ExamApplyUser> examApplyUserList = iExamApplyUserService.list(lqw);

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

@@ -1862,22 +1862,22 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
         ExamApplySiteTimeTwoAddBo timeTwoVo = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo.setStartTime("09:00");
         timeTwoVo.setEndTime("11:00");
-        timeTwoVo.setNum(50L);
+        timeTwoVo.setNum(60L);
         list.add(timeTwoVo);
         ExamApplySiteTimeTwoAddBo timeTwoVo1 = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo1.setStartTime("11:10");
         timeTwoVo1.setEndTime("13:10");
-        timeTwoVo1.setNum(50L);
+        timeTwoVo1.setNum(60L);
         list.add(timeTwoVo1);
         ExamApplySiteTimeTwoAddBo timeTwoVo2 = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo2.setStartTime("14:00");
         timeTwoVo2.setEndTime("16:00");
-        timeTwoVo2.setNum(50L);
+        timeTwoVo2.setNum(60L);
         list.add(timeTwoVo2);
         ExamApplySiteTimeTwoAddBo timeTwoVo3 = new ExamApplySiteTimeTwoAddBo();
         timeTwoVo3.setStartTime("16:10");
         timeTwoVo3.setEndTime("18:10");
-        timeTwoVo3.setNum(50L);
+        timeTwoVo3.setNum(60L);
         list.add(timeTwoVo3);
         return list;
     }