|
@@ -290,9 +290,11 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
|
|
|
}
|
|
}
|
|
|
break;
|
|
break;
|
|
|
case 2://取消
|
|
case 2://取消
|
|
|
|
|
+ examSubscribeVo.setExamType(cdExamSubscribe.getType());
|
|
|
examSubscribeVo.setSubscribeStatus(2);
|
|
examSubscribeVo.setSubscribeStatus(2);
|
|
|
break;
|
|
break;
|
|
|
case 3://过期
|
|
case 3://过期
|
|
|
|
|
+ examSubscribeVo.setExamType(cdExamSubscribe.getType());
|
|
|
examSubscribeVo.setSubscribeStatus(3);
|
|
examSubscribeVo.setSubscribeStatus(3);
|
|
|
break;
|
|
break;
|
|
|
default :
|
|
default :
|
|
@@ -300,7 +302,7 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
|
|
|
}
|
|
}
|
|
|
//补考次数
|
|
//补考次数
|
|
|
Long num = cdExamSubscribeService.getReplenishNum(cdExamSubscribe.getUserId(),cdExamSubscribe.getExamMajor(),cdExamSubscribe.getTenantId());
|
|
Long num = cdExamSubscribeService.getReplenishNum(cdExamSubscribe.getUserId(),cdExamSubscribe.getExamMajor(),cdExamSubscribe.getTenantId());
|
|
|
- examSubscribeVo.setReplenishNum(num);
|
|
|
|
|
|
|
+ examSubscribeVo.setReplenishNum(num == 0 ? num : num - 1);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
return userSubscribe;
|
|
return userSubscribe;
|
|
@@ -328,6 +330,8 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
|
|
|
subscribe.setTenantId(userSubscribe.getTenantId());
|
|
subscribe.setTenantId(userSubscribe.getTenantId());
|
|
|
subscribe.setType(userSubscribe.getType());
|
|
subscribe.setType(userSubscribe.getType());
|
|
|
subscribe.setOrderGoodsId(userSubscribe.getOrderGoodsId());
|
|
subscribe.setOrderGoodsId(userSubscribe.getOrderGoodsId());
|
|
|
|
|
+ subscribe.setCreateTime(DateUtils.getNowTime());
|
|
|
|
|
+ subscribe.setUpdateTime(DateUtils.getNowTime());
|
|
|
if (CollectionUtils.isNotEmpty(bo.getSeatNumberMap())){
|
|
if (CollectionUtils.isNotEmpty(bo.getSeatNumberMap())){
|
|
|
String number = bo.getSeatNumberMap().get(userSubscribeId);
|
|
String number = bo.getSeatNumberMap().get(userSubscribeId);
|
|
|
subscribe.setSeatNumber(number);
|
|
subscribe.setSeatNumber(number);
|