MERGE

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

@@ -494,26 +494,27 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setStuAllNum(studyLong);
             goodsUserVo.setSubscribeSign(2);
 
-            //是否满足预约考试条件
-            if (ObjectUtils.isNotNull(classGradeVo.getPeriodStatus())
-                    && classGradeVo.getPeriodStatus() == 1
-                    && (DateUtils.getNowTime() >= goodsUserVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsUserVo.getServiceEndTime())){
-                UserSubscribe userSubscribe = iUserSubscribeService.getOne(new LambdaQueryWrapper<UserSubscribe>()
-                        .eq(UserSubscribe::getUserId, bo.getUserId())
-                        .eq(UserSubscribe::getGoodsId, goodsUserVo.getGoodsId())
-                        .eq(UserSubscribe::getSubscribeStatus, 1)
-                        .orderByDesc(UserSubscribe::getCreateTime)
-                        .last("limit 1"));
-                if (ObjectUtils.isNull(userSubscribe)){
-                    goodsUserVo.setSubscribeSign(1);
-                }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
-                    goodsUserVo.setSubscribeSign(3);
-                }
-            }
 
             //查询对应考试安排
             List<ExamApplyGoodsVo> examApplyGoodsVoList = iExamApplyGoodsService.listByGoodsId(goodsUserVo.getGoodsId());
             if (examApplyGoodsVoList != null && examApplyGoodsVoList.size() > 0) {
+                //是否满足预约考试条件
+                if (ObjectUtils.isNotNull(classGradeVo.getPeriodStatus())
+                        && classGradeVo.getPeriodStatus() == 1
+                        && (DateUtils.getNowTime() >= goodsUserVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsUserVo.getServiceEndTime())){
+                    UserSubscribe userSubscribe = iUserSubscribeService.getOne(new LambdaQueryWrapper<UserSubscribe>()
+                            .eq(UserSubscribe::getUserId, bo.getUserId())
+                            .eq(UserSubscribe::getGoodsId, goodsUserVo.getGoodsId())
+                            .eq(UserSubscribe::getSubscribeStatus, 1)
+                            .orderByDesc(UserSubscribe::getCreateTime)
+                            .last("limit 1"));
+                    if (ObjectUtils.isNull(userSubscribe)){
+                        goodsUserVo.setSubscribeSign(1);
+                    }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
+                        goodsUserVo.setSubscribeSign(3);
+                    }
+                }
+
                 List<ExamApplyGoodsVo> examApplyGoodsVos = new ArrayList<>();
                 List<ExamApplyGoodsVo> examApplyGoodsVos2 = new ArrayList<>();
                 examApplyGoodsVoList.forEach(examApplyGoodsVo -> {

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

@@ -611,25 +611,26 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
                     }
                 }
 
-                //是否满足预约考试条件
-                if (ObjectUtils.isNotNull(classGradeVo.getPeriodStatus())
-                        && classGradeVo.getPeriodStatus() == 1
-                        && (DateUtils.getNowTime() >= goodsVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsVo.getServiceEndTime())){
-                    UserSubscribe subscribe = iUserSubscribeService.getOne(new LambdaQueryWrapper<UserSubscribe>()
-                            .eq(UserSubscribe::getUserId, bo.getUserId())
-                            .eq(UserSubscribe::getGoodsId, goodsVo.getGoodsId())
-                            .eq(UserSubscribe::getSubscribeStatus, 1)
-                            .orderByDesc(UserSubscribe::getCreateTime)
-                            .last("limit 1"));
-                    if (ObjectUtils.isNull(subscribe)){
-                        goodsVo.setSubscribeSign(1);
-                    }else if (ObjectUtils.isNotNull(subscribe.getResult()) && subscribe.getResult() == 0){
-                        goodsVo.setSubscribeSign(3);
-                    }
-                }
                 //查询对应考试安排
                 List<ExamApplyGoodsVo> examApplyGoodsVoList = iExamApplyGoodsService.listByGoodsId(goodsVo.getGoodsId());
                 if (examApplyGoodsVoList != null && examApplyGoodsVoList.size() > 0) {
+                    //是否满足预约考试条件
+                    if (ObjectUtils.isNotNull(classGradeVo.getPeriodStatus())
+                            && classGradeVo.getPeriodStatus() == 1
+                            && (DateUtils.getNowTime() >= goodsVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsVo.getServiceEndTime())){
+                        UserSubscribe subscribe = iUserSubscribeService.getOne(new LambdaQueryWrapper<UserSubscribe>()
+                                .eq(UserSubscribe::getUserId, bo.getUserId())
+                                .eq(UserSubscribe::getGoodsId, goodsVo.getGoodsId())
+                                .eq(UserSubscribe::getSubscribeStatus, 1)
+                                .orderByDesc(UserSubscribe::getCreateTime)
+                                .last("limit 1"));
+                        if (ObjectUtils.isNull(subscribe)){
+                            goodsVo.setSubscribeSign(1);
+                        }else if (ObjectUtils.isNotNull(subscribe.getResult()) && subscribe.getResult() == 0){
+                            goodsVo.setSubscribeSign(3);
+                        }
+                    }
+
                     List<ExamApplyGoodsVo> examApplyGoodsVos = new ArrayList<>();
                     List<ExamApplyGoodsVo> examApplyGoodsVos2 = new ArrayList<>();
                     examApplyGoodsVoList.forEach(examApplyGoodsVo -> {