merge

zhongzheng-framework/src/main/java/com/zhongzheng/framework/config/SecurityConfig.java

@@ -135,13 +135,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/profile/**").anonymous()
                 .antMatchers("/common/jzs/**").anonymous()
                 .antMatchers("/common/rollback/period").anonymous()
-                .antMatchers("/common/apply/user/profile").anonymous()
+                .antMatchers("/common/apply/**").anonymous()
                 .antMatchers("/common/decompression").anonymous()
                 .antMatchers("/common/merge/file").anonymous()
                 .antMatchers("/common/get/goods").anonymous()
                 .antMatchers("/common/get/orderGoods").anonymous()
                 .antMatchers("/common/check/account").anonymous()
-                .antMatchers("/common/apply/user/profile").anonymous()
                 .antMatchers("/common/get/goods/studyUrl").anonymous()
                 .antMatchers("/common/apply/detail").anonymous()
                 .antMatchers("/common/external/question").anonymous()

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/bo/ExamApplySubscribeBo.java

@@ -22,6 +22,9 @@ public class ExamApplySubscribeBo implements Serializable {
     @ApiModelProperty("标识ID")
     private Long signId;
 
+    @ApiModelProperty("订单商品ID")
+    private Long orderGoodsId;
+
     @ApiModelProperty("学员类型：1非补考 2补考")
     private Integer studentType;
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/exam/domain/ExamApply.java

@@ -64,5 +64,5 @@ private static final long serialVersionUID=1L;
     /** 专场学员资料地址 */
     private String natureUrl;
 
-    private String tenantId;
+    private Long tenantId;
 }

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

@@ -1775,7 +1775,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                 CdExamRoomBo roomBo = new CdExamRoomBo();
                 roomBo.setSignId(apply.getApplyId());
                 roomBo.setDataFrom(1);
-//                roomBo.setTenantId(apply.getTenantId());
+                roomBo.setTenantId(apply.getTenantId());
                 roomBo.setType(1);//七大员预约
                 roomBo.setExamType(apply.getApplyNature());
                 roomBo.setExamTime(millisecond);

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

@@ -2395,41 +2395,27 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         if (ObjectUtil.isNull(examApply)){
             throw new CustomException("考场信息查询不到！请检查");
         }
-        List<Long> goodsIds = iExamApplyService.getApplyGoodsId(examApply.getApplyId(),bo.getMajorName());
-        if (CollectionUtils.isEmpty(goodsIds)){
-            throw new CustomException("该专业下找不到考试对应的课程！请检查");
-        }
 
         //是否存在订单
-        List<OrderGoods> orderGoodsList = iOrderGoodsService.getApplyOrderGoods(goodsIds,user.getUserId());
-        if (CollectionUtils.isEmpty(orderGoodsList)){
-            throw new CustomException("当前学员没有购买该专业下的课程！请检查");
-        }
-        OrderGoods applyOrder = null;
-        for (OrderGoods orderGoods : orderGoodsList) {
-            ClassGradeUser gradeUser = iClassGradeUserService
-                    .getOne(new LambdaQueryWrapper<ClassGradeUser>()
-                    .eq(ClassGradeUser::getUserId, user.getUserId())
-                    .eq(ClassGradeUser::getGradeId, orderGoods.getGradeId())
-                    .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
-                    .last("limit 1"));
-            if (ObjectUtil.isNotNull(gradeUser)){
-                //学时是否通过审核
-                if (ObjectUtils.isNotNull(gradeUser.getPeriodStatus()) && gradeUser.getPeriodStatus() == 1){
-                    applyOrder = orderGoods;
-                }
-            }
-        }
-
-        if(Validator.isEmpty(applyOrder)){
+        OrderGoods orderGoods = iOrderGoodsService.getById(bo.getOrderGoodsId());
+
+        //学时是否通过审核
+        ClassGradeUser gradeUser = iClassGradeUserService
+                .getOne(new LambdaQueryWrapper<ClassGradeUser>()
+                        .eq(ClassGradeUser::getUserId, user.getUserId())
+                        .eq(ClassGradeUser::getGradeId, orderGoods.getGradeId())
+                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
+                        .ge(ClassGradeUser::getPeriodStatus,1)
+                        .last("limit 1"));
+        if (ObjectUtil.isNull(gradeUser)){
             throw new CustomException("该学员未学完，不能预约考试！");
         }
 
         //查询是否已预约考试
         ExamApplyQueryBo queryBo = new ExamApplyQueryBo();
         queryBo.setUserId(user.getUserId());
-        queryBo.setGoodsId(applyOrder.getGoodsId());
-        queryBo.setOrderGoodsId(applyOrder.getOrderGoodsId());
+        queryBo.setGoodsId(orderGoods.getGoodsId());
+        queryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
         Integer countHaveSubscribe = examApplyMapper.countHaveSubscribe(queryBo);
         if (countHaveSubscribe > 0) {
             throw new CustomException("您所报考的专业，已经预约成功，您可在“我的-我的考试预约”中查询详情");
@@ -2474,8 +2460,8 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
 
         //考场信息
         UserSubscribe add = new UserSubscribe();
-        add.setOrderGoodsId(applyOrder.getOrderGoodsId());
-        add.setGoodsId(applyOrder.getGoodsId());
+        add.setOrderGoodsId(orderGoods.getOrderGoodsId());
+        add.setGoodsId(orderGoods.getGoodsId());
         add.setUserId(user.getUserId());
         add.setSeatNumber(tNum.toString());
         add.setApplyId(examApply.getApplyId());
@@ -2512,41 +2498,27 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         if (ObjectUtil.isNull(examApply)){
             throw new CustomException("考场信息查询不到！请检查");
         }
-        List<Long> goodsIds = iExamApplyService.getApplyGoodsId(examApply.getApplyId(),bo.getMajorName());
-        if (CollectionUtils.isEmpty(goodsIds)){
-            throw new CustomException("该专业下找不到考试对应的课程！请检查");
-        }
 
         //是否存在订单
-        List<OrderGoods> orderGoodsList = iOrderGoodsService.getApplyOrderGoods(goodsIds,user.getUserId());
-        if (CollectionUtils.isEmpty(orderGoodsList)){
-            throw new CustomException("当前学员没有购买该专业下的课程！请检查");
-        }
-        OrderGoods applyOrder = null;
-        for (OrderGoods orderGoods : orderGoodsList) {
-            ClassGradeUser gradeUser = iClassGradeUserService
-                    .getOne(new LambdaQueryWrapper<ClassGradeUser>()
-                            .eq(ClassGradeUser::getUserId, user.getUserId())
-                            .eq(ClassGradeUser::getGradeId, orderGoods.getGradeId())
-                            .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
-                            .last("limit 1"));
-            if (ObjectUtil.isNotNull(gradeUser)){
-                //学时是否通过审核
-                if (ObjectUtils.isNotNull(gradeUser.getPeriodStatus()) && gradeUser.getPeriodStatus() == 1){
-                    applyOrder = orderGoods;
-                }
-            }
-        }
-
-        if(Validator.isEmpty(applyOrder)){
+        OrderGoods orderGoods = iOrderGoodsService.getById(bo.getOrderGoodsId());
+
+        //学时是否通过审核
+        ClassGradeUser gradeUser = iClassGradeUserService
+                .getOne(new LambdaQueryWrapper<ClassGradeUser>()
+                        .eq(ClassGradeUser::getUserId, user.getUserId())
+                        .eq(ClassGradeUser::getGradeId, orderGoods.getGradeId())
+                        .eq(ClassGradeUser::getOrderGoodsId, orderGoods.getOrderGoodsId())
+                        .ge(ClassGradeUser::getPeriodStatus,1)
+                        .last("limit 1"));
+        if (ObjectUtil.isNull(gradeUser)){
             throw new CustomException("该学员未预约考试！");
         }
 
         //查询是否已预约考试
         ExamApplyQueryBo queryBo = new ExamApplyQueryBo();
         queryBo.setUserId(user.getUserId());
-        queryBo.setGoodsId(applyOrder.getGoodsId());
-        queryBo.setOrderGoodsId(applyOrder.getOrderGoodsId());
+        queryBo.setGoodsId(orderGoods.getGoodsId());
+        queryBo.setOrderGoodsId(orderGoods.getOrderGoodsId());
         UserSubscribe subscribe = examApplyMapper.getHaveSubscribe(queryBo);
         if (ObjectUtils.isNull(subscribe)) {
             throw new CustomException("该学员未预约考试,请检查数据!");