|
@@ -3204,6 +3204,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
|
|
|
public HttpResponseResult createPackagePracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams) {
|
|
|
if (Objects.isNull(practiceGroupBuyParams.getUserId())) {
|
|
|
return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择教师");
|
|
@@ -3809,6 +3810,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
|
|
|
newCourseJson.put("weekName", DateUtil.weekNumNormalWeekNameMap.get(Integer.parseInt(weekNumStr)));
|
|
|
LocalTime courseStartTime = LocalTime.parse(courseJson.getString(weekNumStr), DateUtil.timeFormatter);
|
|
|
LocalTime courseEndTime = courseStartTime.plusMinutes(practiceCourseMinutes);
|
|
|
+ if(PracticeGroupType.COME_ON_PACKAGE.equals(userPracticeGroup.getType())){
|
|
|
+ courseEndTime = courseStartTime.plusMinutes(2*practiceCourseMinutes);
|
|
|
+ }
|
|
|
newCourseJson.put("startTime", courseStartTime.format(DateUtil.timeFormatter));
|
|
|
newCourseJson.put("endTime", courseEndTime.format(DateUtil.timeFormatter));
|
|
|
coursesArry.add(newCourseJson);
|