1、陪练课调整

2、付费陪练课

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1781,10 +1781,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					}
 				}
 			}
-			
-			if (newCourseSchedule.getStatus() == CourseStatusEnum.NOT_START) {
-				//如果已结束修改成了未开始，需要更新学生考勤记录
-				studentAttendanceDao.deleteStudentAttendancesByCourse(courseScheduleId);
+
+			if(newCourseSchedule.getStatus() == CourseStatusEnum.NOT_START){
+                //如果已结束修改成了未开始，需要更新学生考勤记录
+                studentAttendanceDao.deleteStudentAttendancesByCourse(courseScheduleId);
+            }
+
+            if ((newCourseSchedule.getStatus() != oldCourseSchedule.getStatus() && newCourseSchedule.getStatus() == CourseStatusEnum.NOT_START)) {
 				
 				if(newCourseSchedule.getGroupType() == GroupType.MUSIC){
 					//清理课程作业

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -2135,7 +2135,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Override
     public PracticeGroup findUserLatestPracticeGroup(Integer userId, Long groupId) {
         if(Objects.isNull(groupId)){
-            throw new BizException("请选择续费的课程");
+            throw new BizException("请选择需要续费的课程");
         }
         Date now=new Date();
         PracticeGroupDto userPracticeGroup = practiceGroupDao.findUserPracticeGroup2(userId, groupId);
@@ -2143,7 +2143,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("需要续费的课程组不存在");
         }
         if(userPracticeGroup.getCoursesExpireDate().before(now)){
-            throw new BizException("此课程组已超过可续费期限");
+            throw new BizException("当前课程组已经无法续费，请选择购买");
         }
         return userPracticeGroup;
     }
@@ -2642,12 +2642,12 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         LocalDate courseStartDay=LocalDate.now();
         if(practiceGroupBuyParams.isRenew()){
             if(Objects.isNull(practiceGroupBuyParams.getGroupId())){
-                return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择续费的课程");
+                return BaseController.failed(HttpStatus.EXPECTATION_FAILED, "请选择需要续费的课程");
             }
             PracticeGroup userLatestPracticeGroup = practiceGroupDao.findUserPracticeGroup(practiceGroupBuyParams.getStudentId(),practiceGroupBuyParams.getGroupId());
             if(Objects.nonNull(userLatestPracticeGroup)){
                 if(userLatestPracticeGroup.getCoursesExpireDate().before(now)){
-                    throw new BizException("此课程组已超过可续费期限");
+                    throw new BizException("当前课程组已经无法续费，请选择购买");
                 }
                 LocalDate lastExpiredDay=LocalDateTime.ofInstant(userLatestPracticeGroup.getCoursesExpireDate().toInstant(),DateUtil.zoneId).toLocalDate();
                 if(Objects.nonNull(lastExpiredDay)&&lastExpiredDay.compareTo(courseStartDay)>=0){
@@ -2938,7 +2938,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             return BaseController.succeed(payMap);
         } catch (Exception e) {
-            throw new BizException("调用支付接口出错", e);
+            throw new BizException("订单提交超时，请尝试重新提交购买");
         }
     }
 
@@ -3127,7 +3127,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         Map<DealStatusEnum, List<StudentPaymentOrder>> statusOrderMap = userGroupOrders.stream().collect(Collectors.groupingBy(StudentPaymentOrder::getStatus));
         List<StudentPaymentOrder> successOrders=statusOrderMap.get(DealStatusEnum.SUCCESS);
         if(!CollectionUtils.isEmpty(successOrders)&&successOrders.size()>0){
-            throw new BizException("此课程组存在支付成功的订单");
+            throw new BizException("该订单已经支付成功，请勿重复购买");
         }
 
         StudentPaymentOrder latestOrder=userGroupOrders.stream().max(Comparator.comparing(StudentPaymentOrder::getCreateTime)).get();
@@ -3137,7 +3137,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         List<StudentPaymentOrder> ingOrders = statusOrderMap.get(DealStatusEnum.ING);
         if(CollectionUtils.isEmpty(ingOrders)||ingOrders.size()<=0){
-            throw new BizException("此课程组不存在待支付的订单");
+            throw new BizException("改订单支付失败，请重新购买");
         }else{
             for (StudentPaymentOrder ingOrder : ingOrders) {
                 ingOrder.setStatus(DealStatusEnum.CLOSE);
@@ -3179,7 +3179,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
             return BaseController.succeed(payMap);
         } catch (Exception e) {
-            throw new BizException("调用支付接口出错", e);
+            throw new BizException("订单提交超时，请尝试重新提交购买");
         }
     }