update

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

@@ -645,33 +645,35 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
 
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(studentRegistration.getMusicGroupId(), studentRegistration.getActualSubjectId());
         
-        //判断之前是否已有订单
-        List<StudentPaymentOrder> oldStudentPaymentOrderList = studentPaymentOrderService.queryByCondition(GroupType.MUSIC, studentRegistration.getMusicGroupId(), studentRegistration.getUserId(),DealStatusEnum.SUCCESS , OrderTypeEnum.APPLY);
-        
-        int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
-        int paidZeroNum = musicOneSubjectClassPlan.getPaidZeroNum() == null ? 0 : musicOneSubjectClassPlan.getPaidZeroNum();
-        if ((musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) && !buyCloudTeacher && StringUtils.isBlank(maintenanceGoodsId)))
-        {
-        	if(studentRegistration.getPaymentStatus() != YES){
-        		paidZeroFlag = true;
-        	}
-            if (studentRegistration.getNoneNeedCloudTeacher().equals(1) && (oldStudentPaymentOrderList == null || oldStudentPaymentOrderList.size() == 0)) {
-                musicOneSubjectClassPlan.setPaidZeroNum(paidZeroNum + 1);
-                musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
-            }
-        } else {
-			if (oldStudentPaymentOrderList == null || oldStudentPaymentOrderList.size() == 0) {
-				musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
+		if (studentRegistration.getMusicGroupStatus() != StudentMusicGroupStatusEnum.NORMAL) {
+			// 判断之前是否已有订单
+			List<StudentPaymentOrder> oldStudentPaymentOrderList = studentPaymentOrderService.queryByCondition(GroupType.MUSIC,
+					studentRegistration.getMusicGroupId(), studentRegistration.getUserId(), DealStatusEnum.SUCCESS, OrderTypeEnum.APPLY);
+
+			int paidNum = musicOneSubjectClassPlan.getPaidStudentNum() == null ? 0 : musicOneSubjectClassPlan.getPaidStudentNum();
+			int paidZeroNum = musicOneSubjectClassPlan.getPaidZeroNum() == null ? 0 : musicOneSubjectClassPlan.getPaidZeroNum();
+			if ((musicGroup.getCourseViewType().equals(CourseViewTypeEnum.MEMBER_FEE) && !buyCloudTeacher && StringUtils.isBlank(maintenanceGoodsId))) {
+				if (studentRegistration.getPaymentStatus() != YES) {
+					paidZeroFlag = true;
+				}
+				if (studentRegistration.getNoneNeedCloudTeacher().equals(1) && (oldStudentPaymentOrderList == null || oldStudentPaymentOrderList.size() == 0)) {
+					musicOneSubjectClassPlan.setPaidZeroNum(paidZeroNum + 1);
+					musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
+				}
+			} else {
+				if (oldStudentPaymentOrderList == null || oldStudentPaymentOrderList.size() == 0) {
+					musicOneSubjectClassPlan.setPaidStudentNum(paidNum + 1);
+				}
 			}
-        }
-        if (studentRegistration.getMusicGroupStatus() != StudentMusicGroupStatusEnum.NORMAL && musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
-            throw new BizException("乐团该声部人数暂时已满，请稍后再试");
-        }
-        
-        int count = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
-        if (count <= 0) {
-            throw new BizException("排队人数过多，请重试");
-        }
+			if (musicOneSubjectClassPlan.getPaidStudentNum() > musicOneSubjectClassPlan.getExpectedStudentNum()) {
+				throw new BizException("乐团该声部人数暂时已满，请稍后再试");
+			}
+
+			int count = musicGroupSubjectPlanService.update(musicOneSubjectClassPlan);
+			if (count <= 0) {
+				throw new BizException("排队人数过多，请重试");
+			}
+		}
         if (paidZeroFlag) {
             studentPaymentOrder.setVersion(0);
             String code = studentRegistration.getNoneNeedCloudTeacher().equals(1) ? "200" : "205";