Merge remote-tracking branch 'origin/master'

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

@@ -153,14 +153,16 @@ public class MusicGroupController extends BaseController {
         if (studentRegistration.getPaymentStatus() != PaymentStatusEnum.OPEN) {
             return failed("乐团还未开启缴费，请等待通知");
         }
-        if(studentRegistration.getTemporaryCourseFee() == null &&
-                (musicGroup.getStatus() != MusicGroupStatusEnum.APPLY && musicGroup.getStatus() != MusicGroupStatusEnum.PAY)){
-            return failed("乐团在"+musicGroup.getStatus().getMsg()+",不能缴费");
-        }
-        Date now = new Date();
-        if (DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
-            return failed("乐团缴费时间已截止");
-        }
+		if (studentRegistration.getTemporaryCourseFee() == null) {
+			if (musicGroup.getStatus() != MusicGroupStatusEnum.APPLY && musicGroup.getStatus() != MusicGroupStatusEnum.PAY) {
+				return failed("乐团在" + musicGroup.getStatus().getMsg() + ",不能缴费");
+			}
+
+			Date now = new Date();
+			if (DateUtil.daysBetween(musicGroup.getPaymentExpireDate(), now) > 1) {
+				return failed("乐团缴费时间已截止");
+			}
+		}
         studentRegistration.setOwnershipType(musicGroup.getOwnershipType());
         studentRegistration.setChargeTypeId(musicGroup.getChargeTypeId());