|
@@ -132,6 +132,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
private TeacherCourseRewardService teacherCourseRewardService;
|
|
|
@Autowired
|
|
|
private StudentPaymentRouteOrderService studentPaymentRouteOrderService;
|
|
|
+ @Autowired
|
|
|
+ private StudentGoodsSellDao studentGoodsSellDao;
|
|
|
|
|
|
private static Map<Integer, Map<Integer, List<Integer>>> schoolSubjectTeachersMap;
|
|
|
|
|
@@ -3369,6 +3371,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
practiceBuyResult.setCreateTime(order.getCreateTime());
|
|
|
practiceBuyResult.setPrice(order.getExpectAmount());
|
|
|
practiceBuyResult.setType(order.getType().getCode());
|
|
|
+
|
|
|
+ if(order.getGroupType().equals(GroupType.GOODS_SELL)){
|
|
|
+ practiceBuyResult.setDetail(studentGoodsSellDao.getStudentGoodsSellDto(orderNo));
|
|
|
+ }
|
|
|
+
|
|
|
if (order.getStatus().equals(DealStatusEnum.FAILED) || order.getGroupType().equals(GroupType.REPAIR)||Objects.isNull(order.getMusicGroupId())) {
|
|
|
return practiceBuyResult;
|
|
|
}
|