'update'

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -189,7 +189,7 @@ public class MusicGroupController extends BaseController {
         MusicGroupPaymentCalenderDetail userLastCalenderDetail = musicGroupPaymentCalenderDetailDao.getUserLastCalenderDetail(musicGroupId, userId);
         if (userLastCalenderDetail == null) {
             MusicGroupPaymentCalender lastCalender = musicGroupPaymentCalenderDao.getLastStartOne(musicGroupId);
-            String tips = (lastCalender != null && lastCalender.getStatus() == PaymentCalenderStatusEnum.OVER) ? "当前续费时间已截止,如有问题请联系指导老师" : "当前续费未开始,如有问题请联系指导老师";
+            String tips = (lastCalender != null && lastCalender.getStatus() == PaymentCalenderStatusEnum.OVER) ? "缴费已截止,如有问题请联系指导老师" : "缴费暂未开始,如有问题请联系指导老师";
             throw new BizException(tips);
         }
 
@@ -236,18 +236,18 @@ public class MusicGroupController extends BaseController {
             throw new BizException("缴费项不存在该学员，请联系教务老师");
         }
         if(calenderDetail.getPaymentStatus() == PaymentStatus.PAID_COMPLETED){
-            throw new BizException("您已缴费请勿重复支付");
+            throw new BizException("您已缴费，请勿重复提交");
         }else if(calenderDetail.getPaymentStatus() == PaymentStatus.PROCESSING){
-            throw new BizException("当前缴费项存在待处理的订单，请稍候尝试");
+            throw new BizException("存在待处理的订单，请稍候尝试");
         }
         //缴费项目已开启或者单独开启
         Map renew;
         if(calender.getStatus() == PaymentCalenderStatusEnum.OPEN || calenderDetail.getOpen() == 1){
             renew = musicGroupService.renew(calenderId, userId, isUseBalancePayment);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
-            throw new BizException("当前缴费项时间已截止,如有问题请联系指导老师");
+            throw new BizException("缴费已截止,如有问题请联系指导老师");
         }else {
-            throw new BizException("当前缴费项未开始,如有问题请联系指导老师");
+            throw new BizException("缴费暂未开始,如有问题请联系指导老师");
         }
         if (renew.containsKey("tradeState")) {
             return failed(HttpStatus.CREATED, "恭喜您,缴费成功!");

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupPaymentCalenderController.java

@@ -64,7 +64,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         if(calenderDetail.getPaymentStatus() == PaymentStatus.PAID_COMPLETED){
             throw new BizException("您已缴费，请勿重复提交");
         }else if(calenderDetail.getPaymentStatus() == PaymentStatus.PROCESSING){
-            throw new BizException("当前缴费项存在待处理的订单，请稍候尝试");
+            throw new BizException("存在待处理的订单，请稍候尝试");
         }
         if(calender.getStatus() == PaymentCalenderStatusEnum.OPEN){
             StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId,musicGroupId);
@@ -79,9 +79,9 @@ public class MusicGroupPaymentCalenderController extends BaseController {
             model.put("balance",studentRegistration.getBalance());
             return succeed(model);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
-            throw new BizException("当前缴费项时间已截止,如有问题请联系指导老师");
+            throw new BizException("缴费已截止,如有问题请联系指导老师");
         }else {
-            throw new BizException("当前缴费项未开始,如有问题请联系指导老师");
+            throw new BizException("缴费暂未开始,如有问题请联系指导老师");
         }
     }
 }