fix merge

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

@@ -116,7 +116,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         //查询该学员该科目的预约记录
         LambdaQueryWrapper<UserMockSubscribe> lqw = Wrappers.lambdaQuery();
         lqw.eq(UserMockSubscribe::getUserId, bo.getUserId());
-        lqw.eq(UserMockSubscribe::getEachExamId, bo.getEachExamId());
+        lqw.eq(UserMockSubscribe::getMockMajorSubjectId, bo.getMockMajorSubjectId());
         lqw.eq(UserMockSubscribe::getApplyId, bo.getApplyId());
         lqw.orderByDesc(UserMockSubscribe::getCreateTime).last("limit 1");
         UserMockSubscribe userMockSubscribe = this.getOne(lqw);
@@ -127,12 +127,7 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
             }
             //重复预约
             //已预约模考还没开始
-            if (System.currentTimeMillis()/1000 < userMockSubscribe.getApplySiteExamTime()) {
-                throw new CustomException("已存在同类型模考预约，不能再预约了哦~");
-            }
-            //已预约模考还没结束，或已参加
-            if (!(System.currentTimeMillis()/1000 > formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteEndTime())
-                    && userMockSubscribe.getHandStatus() == 0)) {
+            if (System.currentTimeMillis()/1000 < formatTime(userMockSubscribe.getApplySiteExamTime(), userMockSubscribe.getApplySiteEndTime())) {
                 throw new CustomException("已存在同类型模考预约，不能再预约了哦~");
             }
         }