|
@@ -148,24 +148,10 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
|
|
|
throw new BizException("您已报考过选择的考级项目");
|
|
|
} else {
|
|
|
if (!degreeRegistration.getIsRepay() && degree.getStatus().equals(1)) {
|
|
|
- List<StudentPaymentOrder> orders = studentPaymentOrderDao.findPaymentOrderByGroupType(degreeRegistration.getUserId(), degreeRegistration.getSporadicId(), "SPORADIC", DealStatusEnum.ING);
|
|
|
- if (orders != null && orders.size() > 0) {
|
|
|
- List<StudentPaymentOrderDetail> studentPaymentOrderDetails = studentPaymentOrderDetailDao.getOrderDetail(orders.get(0).getId());
|
|
|
- Map<String, Object> result = new HashMap<>();
|
|
|
- result.put("degree", degree);
|
|
|
- if(!CollectionUtils.isEmpty(studentPaymentOrderDetails)){
|
|
|
- result.put("additionCourseInfo", studentPaymentOrderDetails.get(0).getGoodsIdList());
|
|
|
- }
|
|
|
- return BaseController.failed(HttpStatus.CONTINUE, result, "");
|
|
|
- }
|
|
|
+ return BaseController.failed(HttpStatus.CONTINUE, "");
|
|
|
}
|
|
|
- degreeRegistration.setMoney(degree.getMoney());
|
|
|
- degreeRegistration.setTheoryMoney(degree.getTheoryMoney());
|
|
|
- degreeRegistration.setId(degree.getId());
|
|
|
- degreeRegistration.setStatus(1);
|
|
|
- degreeRegistration.setCreateTime(nowDate);
|
|
|
- degreeRegistration.setUpdateTime(nowDate);
|
|
|
- degreeRegistrationDao.update(degreeRegistration);
|
|
|
+ degree.setStatus(0);
|
|
|
+ degreeRegistrationDao.update(degree);
|
|
|
}
|
|
|
}
|
|
|
|