submit

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

@@ -816,17 +816,29 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
                         && classGradeVo.getPeriodStatus() == 1
                         && (DateUtils.getNowTime() >= goodsUserVo.getServiceStartTime() && DateUtils.getNowTime() <= goodsUserVo.getServiceEndTime())){
                     UserSubscribe userSubscribe = baseMapper.getUserSub(bo.getUserId(),goodsUserVo.getGoodsId());
-                    if (ObjectUtils.isNull(userSubscribe)){
+                    Long examTime = 0L;
+                    if (ObjectUtils.isNotNull(userSubscribe.getApplySiteEndTime())){
+                        Long examTime1 = userSubscribe.getApplySiteExamTime();
+                        String applySiteEndTime = userSubscribe.getApplySiteEndTime();
+                        String s = DateUtils.timestampToDateFormat(examTime1, "yyyy-MM-dd");
+                        String format = String.format("%s %s", s, applySiteEndTime);
+                        examTime = DateUtils.dateTimeSec("yyyy-MM-dd HH:mm", format);
+                    }
+                    if (examTime > 0 && DateUtils.getNowTime() > examTime && ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
                         goodsUserVo.setSubscribeSign(1);
-                    }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
-                            && userSubscribe.getExamStatus() == 1
-                            && ObjectUtils.isNull(userSubscribe.getResult())){
-                        goodsUserVo.setSubscribeSign(2);
-                    }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
-                            && userSubscribe.getExamStatus() == 0){
-                        goodsUserVo.setSubscribeSign(4);
-                    }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
-                        goodsUserVo.setSubscribeSign(3);
+                    }else {
+                        if (ObjectUtils.isNull(userSubscribe)){
+                            goodsUserVo.setSubscribeSign(1);
+                        }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
+                                && userSubscribe.getExamStatus() == 1
+                                && ObjectUtils.isNull(userSubscribe.getResult())){
+                            goodsUserVo.setSubscribeSign(2);
+                        }else if (userSubscribe.getSubscribeStatus() == 1 && ObjectUtils.isNotNull(userSubscribe.getExamStatus())
+                                && userSubscribe.getExamStatus() == 0){
+                            goodsUserVo.setSubscribeSign(4);
+                        }else if (ObjectUtils.isNotNull(userSubscribe.getResult()) && userSubscribe.getResult() == 0){
+                            goodsUserVo.setSubscribeSign(3);
+                        }
                     }
                 }
 

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

@@ -1148,6 +1148,11 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 }
                 goodsId = item;
             }
+            if (ObjectUtils.isNull(goodsId)){
+                userSubscribeImport.setCause("该学员剩余考试次数不足或已存在相同考试场次");
+                userSubscribeImports.add(userSubscribeImport);
+                continue;
+            }
 
             userSubscribeAddBo.setGoodsId(goodsId);
             //获得当前所在班级