|
@@ -89,6 +89,8 @@ public class StudentOrderController extends BaseController {
|
|
private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
|
|
private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
|
|
@Autowired
|
|
@Autowired
|
|
private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
|
|
private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
|
|
|
|
|
|
|
|
|
|
@Value("${spring.profiles.active:dev}")
|
|
@Value("${spring.profiles.active:dev}")
|
|
@@ -182,6 +184,8 @@ public class StudentOrderController extends BaseController {
|
|
orderDetail.put("detail", studentGoodsSellDao.getStudentGoodsSellDto(orderNo));
|
|
orderDetail.put("detail", studentGoodsSellDao.getStudentGoodsSellDto(orderNo));
|
|
} else if (orderByOrderNo.getGroupType().equals(GroupType.REPLACEMENT)) {
|
|
} else if (orderByOrderNo.getGroupType().equals(GroupType.REPLACEMENT)) {
|
|
orderDetail.put("detail", replacementInstrumentActivityDao.getInfo(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
|
|
orderDetail.put("detail", replacementInstrumentActivityDao.getInfo(Integer.parseInt(orderByOrderNo.getMusicGroupId())));
|
|
|
|
+ } else if (orderByOrderNo.getGroupType().equals(GroupType.DEGREE)) {
|
|
|
|
+ orderDetail.put("detail", childrenDayDegreeDetailDao.getByOrderId(orderByOrderNo.getId()));
|
|
}
|
|
}
|
|
return succeed(orderDetail);
|
|
return succeed(orderDetail);
|
|
}
|
|
}
|