zouxuan před 4 roky
rodič
revize
aab3c3b5b5

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

@@ -168,7 +168,7 @@ public class MusicGroupController extends BaseController {
         return succeed(studentRegistration);
     }
 
-    @ApiOperation(value = "查询续费信息")
+    /*@ApiOperation(value = "查询续费信息")
     @GetMapping("/queryRenewInfo")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团编号", required = true, dataType = "String")})
     public HttpResponseResult queryRenewInfo(String musicGroupId) throws Exception {
@@ -209,7 +209,7 @@ public class MusicGroupController extends BaseController {
         model.put("balance", studentRegistration.getBalance());
 
         return succeed(model);
-    }
+    }*/
 
     @ApiOperation(value = "续费")
     @GetMapping("/renew")

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

@@ -66,7 +66,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         }else if(calenderDetail.getPaymentStatus() == PaymentStatus.PROCESSING){
             throw new BizException("存在待处理的订单,请稍候尝试");
         }
-        if(calender.getStatus() == PaymentCalenderStatusEnum.OPEN){
+        if(calender.getStatus() == PaymentCalenderStatusEnum.OPEN || calenderDetail.getOpen() == 1){
             StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId,musicGroupId);
             if (studentRegistration == null) {
                 return failed("乐团报名信息不存在");