增加调整班级增加临时班级接口

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClassGroupStudentStatusEnum;
 import com.ym.mec.biz.dal.enums.KitPurchaseMethodEnum;
+import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -79,7 +80,7 @@ public class StudentRegistration {
     private Date birthdate;
 
     @ApiModelProperty(value = "缴费状态（1-已缴费 0-未交费）", required = false)
-    private YesOrNoEnum paymentStatus;
+    private PaymentStatusEnum paymentStatus;
 
     @ApiModelProperty(value = "用户所在乐团状态）",required = false)
     private ClassGroupStudentStatusEnum musicGroupStatus;
@@ -187,7 +188,7 @@ public class StudentRegistration {
         this.isAllowAdjust = isAllowAdjust;
     }
 
-    public void setPaymentStatus(YesOrNoEnum paymentStatus) {
+    public void setPaymentStatus(PaymentStatusEnum paymentStatus) {
         this.paymentStatus = paymentStatus;
     }
 
@@ -239,7 +240,7 @@ public class StudentRegistration {
         return this.parentsCompany;
     }
 
-    public YesOrNoEnum getPaymentStatus() {
+    public PaymentStatusEnum getPaymentStatus() {
         return paymentStatus;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PaymentStatusEnum.java

@@ -0,0 +1,28 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum PaymentStatusEnum implements BaseEnum<Integer, PaymentStatusEnum> {
+	NO(0,"否"),
+	OPEN(1,"开启缴费"),
+	YES(2,"已缴费");
+
+	private Integer code;
+
+	private String desc;
+
+	private PaymentStatusEnum(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRegistrationService.java

@@ -197,5 +197,11 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 */
 	List<StudentRegistration> findStudentListByUserIdList(String musicGroupId, List<Integer> userIdList);
 
+	/**
+	 * 开启缴费
+	 * @param id
+	 * @return
+	 */
+	int openPayment(Long id);
 
 }

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

@@ -136,7 +136,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                         List<StudentRegistration> musicGroupStudentRegistrationList = studentRegistrationService.findStudentListByIdList(e.getRegisterIdList());
                         for (StudentRegistration studentRegistration : musicGroupStudentRegistrationList) {
                             studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
-                            studentRegistration.setPaymentStatus(YesOrNoEnum.NO);
+                            studentRegistration.setPaymentStatus(PaymentStatusEnum.NO);
                             studentRegistration.setMusicGroupId(musicGroupId);
                             studentRegistration.setSubjectId(e.getSubjectId());
                             studentRegistration.setActualSubjectId(e.getSubjectId());

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

@@ -447,7 +447,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         //成功报名状态变更
         StudentRegistration studentRegistration = studentRegistrationDao.queryByUserIdAndMusicGroupId(studentPaymentOrder.getUserId(), studentPaymentOrder.getMusicGroupId());
         if (studentPaymentOrder.getStatus().equals(DealStatusEnum.SUCCESS)) {
-            studentRegistration.setPaymentStatus(YesOrNoEnum.YES);
+            studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);
             studentRegistration.setMusicGroupStatus(ClassGroupStudentStatusEnum.NORMAL);
             studentRegistrationDao.update(studentRegistration);
         }
@@ -493,4 +493,11 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     public List<StudentRegistration> findStudentListByUserIdList(String musicGroupId, List<Integer> userIdList) {
         return studentRegistrationDao.findStudentListByUserIdList(musicGroupId,userIdList);
     }
+
+    @Override
+    public int openPayment(Long id) {
+        StudentRegistration studentRegistration = studentRegistrationDao.get(id);
+        studentRegistration.setPaymentStatus(PaymentStatusEnum.OPEN);
+        return studentRegistrationDao.update(studentRegistration);
+    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/StudentRegistrationController.java

@@ -115,4 +115,12 @@ public class StudentRegistrationController extends BaseController {
         return succeed(studentRegistrationService.findMusicGroupNoClassGroupStudent(musicGroupId, actualSubjectId));
     }
 
+    @ApiOperation(value = "开启缴费")
+    @PostMapping("/openPayment")
+    @PreAuthorize("@pcs.hasPermissions('studentRegistration/openPayment')")
+    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "报名id", required = true, dataType = "int")})
+    public HttpResponseResult openPayment(Long id) {
+        return succeed(studentRegistrationService.openPayment(id));
+    }
+
 }