周箭河 před 5 roky
rodič
revize
ebba0ee5a5

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

@@ -6,10 +6,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dto.RegisterPayDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
+import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -129,6 +126,10 @@ public class MusicGroupController extends BaseController {
         if (!studentRegistration.getPaymentStatus().equals(PaymentStatusEnum.OPEN)) {
             return failed("乐团还未开启缴费,请等待通知");
         }
+        if(studentRegistration.getTemporaryCourseFee() == null &&
+                (!musicGroup.getStatus().equals(MusicGroupStatusEnum.APPLY) || !musicGroup.getStatus().equals(MusicGroupStatusEnum.PAY))){
+            return failed("乐团在"+musicGroup.getStatus().getMsg()+",不能缴费");
+        }
         studentRegistration.setOwnershipType(musicGroup.getOwnershipType());
 
         return succeed(studentRegistration);