he2802 3 роки тому
батько
коміт
69a571b5a6

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

@@ -470,29 +470,29 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                     }else {
                         examApplyGoodsVos2.add(examApplyGoodsVo);
                     }
-                    LambdaQueryWrapper<UserSubscribe> lq = Wrappers.lambdaQuery();
-                    lq.eq(UserSubscribe::getApplyId, examApplyGoodsVo.getApplyId());
-                    lq.eq(UserSubscribe::getOrderGoodsId, goodsUserVo.getOrderGoodsId());
-                    lq.eq(UserSubscribe::getSubscribeStatus, 1);
-                    lq.eq(UserSubscribe::getBeforeStatus, 1);
-                    UserSubscribe userSubscribe = iUserSubscribeService.getOne(lq);
-                    if (userSubscribe != null) {
-                        LambdaQueryWrapper<ExamBefore> lqw1 = Wrappers.lambdaQuery();
-                        lqw1.eq(ExamBefore::getBeforeId, userSubscribe.getBeforeId());
-                        lqw1.eq(ExamBefore::getStatus, 1);
-                        ExamBefore examBefore = iExamBeforeService.getOne(lqw1);
-                        if (examBefore != null) {
-                            if (System.currentTimeMillis()/1000 > examBefore.getBeforeStartTime() && System.currentTimeMillis()/1000 < examBefore.getBeforeEndTime()) {
-                                goodsUserVo.setBeforeStatus(1L);
-                                goodsUserVo.setBeforeName(examBefore.getBeforeName());
-                                goodsUserVo.setBeforeStartTime(examBefore.getBeforeStartTime());
-                                goodsUserVo.setBeforeEndTime(examBefore.getBeforeEndTime());
-                            }
-                        }
-                    }
                 });
                 examApplyGoodsVos.addAll(examApplyGoodsVos2);
                 goodsUserVo.setExamApplyGoodsList(examApplyGoodsVos);
+
+                LambdaQueryWrapper<UserSubscribe> lq = Wrappers.lambdaQuery();
+                lq.eq(UserSubscribe::getOrderGoodsId, goodsUserVo.getOrderGoodsId());
+                lq.eq(UserSubscribe::getSubscribeStatus, 1);
+                lq.eq(UserSubscribe::getBeforeStatus, 1);
+                UserSubscribe userSubscribe = iUserSubscribeService.getOne(lq);
+                if (userSubscribe != null) {
+                    LambdaQueryWrapper<ExamBefore> lqw1 = Wrappers.lambdaQuery();
+                    lqw1.eq(ExamBefore::getBeforeId, userSubscribe.getBeforeId());
+                    lqw1.eq(ExamBefore::getStatus, 1);
+                    ExamBefore examBefore = iExamBeforeService.getOne(lqw1);
+                    if (examBefore != null) {
+                        if (System.currentTimeMillis()/1000 > examBefore.getBeforeStartTime() && System.currentTimeMillis()/1000 < examBefore.getBeforeEndTime()) {
+                            goodsUserVo.setBeforeStatus(1L);
+                            goodsUserVo.setBeforeName(examBefore.getBeforeName());
+                            goodsUserVo.setBeforeStartTime(examBefore.getBeforeStartTime());
+                            goodsUserVo.setBeforeEndTime(examBefore.getBeforeEndTime());
+                        }
+                    }
+                }
             }
         }
         return goodsUserVos;