|
@@ -2409,6 +2409,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
|
|
|
if (CollectionUtils.isEmpty(allTeacherCourses)) {
|
|
|
+ if(weekNumApplyTimesMap.size()<=1){
|
|
|
+ weekNumApplyTimesMap=new HashMap<>();
|
|
|
+ }
|
|
|
result.put("teacherFreeDays", weekNumApplyTimesMap);
|
|
|
return result;
|
|
|
}
|
|
@@ -2462,6 +2465,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
weekNumApplyTimesMap.put(courseStartTime.getDayOfWeek().getValue(), applyTimeStrs);
|
|
|
}
|
|
|
+ if(weekNumApplyTimesMap.size()<=1){
|
|
|
+ weekNumApplyTimesMap=new HashMap<>();
|
|
|
+ }
|
|
|
result.put("teacherFreeDays", weekNumApplyTimesMap);
|
|
|
return result;
|
|
|
}
|
|
@@ -2701,7 +2707,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
String orderNo=idGeneratorService.generatorId("payment") + "";
|
|
|
studentPaymentOrder.setOrderNo(orderNo);
|
|
|
studentPaymentOrder.setStatus(DealStatusEnum.ING);
|
|
|
- studentPaymentOrder.setType(OrderTypeEnum.SMALL_CLASS_TO_BUY);
|
|
|
+ studentPaymentOrder.setType(OrderTypeEnum.PRACTICE_GROUP_BUY);
|
|
|
studentPaymentOrder.setExpectAmount(amount);
|
|
|
studentPaymentOrder.setMusicGroupId(practiceGroupBuyParams.getId().toString());
|
|
|
studentPaymentOrder.setActualAmount(studentPaymentOrder.getExpectAmount());
|
|
@@ -2873,4 +2879,42 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
return userPracticeGroups;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public PracticeBuyResultDto queryOrderInfo(String orderNo) {
|
|
|
+ if(StringUtils.isBlank(orderNo)){
|
|
|
+ throw new BizException("订单不存在");
|
|
|
+ }
|
|
|
+ StudentPaymentOrder order = studentPaymentOrderDao.findOrderByOrderNo(orderNo);
|
|
|
+ if(Objects.isNull(order)){
|
|
|
+ throw new BizException("订单不存在");
|
|
|
+ }
|
|
|
+ PracticeBuyResultDto practiceBuyResult=new PracticeBuyResultDto();
|
|
|
+ practiceBuyResult.setOrderNo(orderNo);
|
|
|
+ practiceBuyResult.setStatus(order.getStatus());
|
|
|
+ practiceBuyResult.setCreateTime(order.getCreateTime());
|
|
|
+ if(order.getStatus().equals(DealStatusEnum.FAILED)){
|
|
|
+ return practiceBuyResult;
|
|
|
+ }
|
|
|
+ SysConfig practiceCourseMinutesConfig = sysConfigService.findByParamName(SysConfigService.PRACTICE_COURSE_MINUTES);
|
|
|
+ Integer practiceCourseMinutes = practiceCourseMinutesConfig.getParanValue(Integer.class);
|
|
|
+ PracticeGroup practiceGroup = practiceGroupDao.get(Long.valueOf(order.getMusicGroupId()));
|
|
|
+ JSONArray coursesArry=new JSONArray();
|
|
|
+ JSONObject courseJson=JSON.parseObject(practiceGroup.getDrillTimesJson());
|
|
|
+ for (String weekNumStr : courseJson.keySet()) {
|
|
|
+ JSONObject newCourseJson=new JSONObject();
|
|
|
+ newCourseJson.put("weekName",DateUtil.weekNumNormalWeekNameMap.get(Integer.parseInt(weekNumStr)));
|
|
|
+ LocalTime courseStartTime=LocalTime.parse(courseJson.getString(weekNumStr),DateUtil.timeFormatter);
|
|
|
+ LocalTime courseEndTime=courseStartTime.plusMinutes(practiceCourseMinutes);
|
|
|
+ newCourseJson.put("startTime",courseStartTime.format(DateUtil.timeFormatter));
|
|
|
+ newCourseJson.put("endTime",courseEndTime.format(DateUtil.timeFormatter));
|
|
|
+ coursesArry.add(newCourseJson);
|
|
|
+ }
|
|
|
+ practiceBuyResult.setDrillTimesJson(coursesArry.toJSONString());
|
|
|
+ practiceBuyResult.setCourseStartTime(practiceGroup.getCoursesStartDate());
|
|
|
+ practiceBuyResult.setCourseEndTime(practiceGroup.getCoursesExpireDate());
|
|
|
+ Teacher teacher = teacherDao.get(practiceGroup.getUserId());
|
|
|
+ practiceBuyResult.setTeacherName(teacher.getRealName());
|
|
|
+ return practiceBuyResult;
|
|
|
+ }
|
|
|
}
|