系统收费

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

@@ -163,15 +163,21 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				throw new BizException("[临时加课]不支持多周期缴费");
 			}
 		}
-
+		MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
+		if (musicGroup == null) {
+			throw new BizException("乐团查询失败，请检查参数");
+		}
 		if (paymentType == PaymentType.ADD_STUDENT) {
 			//获取缴费状态在审核中或者已拒绝的缴费项目的学员
 			Integer userId = Integer.parseInt(musicGroupPaymentCalenderDto.getStudentIds());
-			//该学员是否在其他的会员团
-			boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroupId,userId);
-			if(hasMemberGroup){
-				throw new BizException("操作失败：该学员已在其他系统收费团");
+			if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+				//该学员是否在其他的会员团
+				boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroupId,userId);
+				if(hasMemberGroup){
+					throw new BizException("操作失败：该学员已在其他系统收费团");
+				}
 			}
+
 			String studentIds = musicGroupPaymentCalenderDao.queryCalenderStudentIds(musicGroupId,null);
 			if(StringUtils.isNotEmpty(studentIds)){
 				if(studentIds.contains(userId.toString())){
@@ -184,12 +190,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 		}
 
-		MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
-
-		if (musicGroup == null) {
-			throw new BizException("乐团查询失败，请检查参数");
-		}
-		
 		if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroup.getStatus() != MusicGroupStatusEnum.PRE_BUILD_FEE) {
 			throw new BizException("创建缴费失败：已存在缴费项目");
 		}

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

@@ -397,9 +397,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             studentDao.insert(student);
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
         } else {
-            boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroup.getId(), user.getId());
-            if(hasMemberGroup){
-                throw new BizException("乐团报名失败：您已在其他系统收费团");
+            if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+                //该学员是否在其他的会员团
+                boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroupId,user.getId());
+                if(hasMemberGroup){
+                    throw new BizException("乐团报名失败：该学员已在其他系统收费团");
+                }
             }
             user.setUsername(studentPreRegistration.getUserName());
             if (!user.getUserType().contains("STUDENT")) {

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

@@ -722,9 +722,12 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 sysUser.setImToken(register.getToken());
                 teacherDao.updateUser(sysUser);
             } else {
-                boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroupId, sysUser.getId());
-                if(hasMemberGroup){
-                    throw new BizException("操作失败：该学员已在其他系统收费团");
+                if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+                    //该学员是否在其他的会员团
+                    boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroupId,sysUser.getId());
+                    if(hasMemberGroup){
+                        throw new BizException("操作失败：该学员已在其他系统收费团");
+                    }
                 }
                 StudentRegistration oldReg = studentRegistrationDao.getByUserIdAndMusicGroupId(musicGroupId, sysUser.getId());
                 if (oldReg != null && oldReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT && oldReg.getMusicGroupStatus() != StudentMusicGroupStatusEnum.APPLY) {

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

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.biz.dal.enums.StudentMusicGroupStatusEnum;
@@ -54,9 +55,11 @@ public class MusicGroupRegisterController extends BaseController {
         if (musicGroup == null) {
             return failed("乐团信息不存在");
         }
-        boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroup.getId(), sysUser.getId());
-        if(hasMemberGroup){
-            throw new BizException("乐团报名失败：您已在其他系统收费团");
+        if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
+            boolean hasMemberGroup = studentRegistrationDao.checkHasMemberGroup(musicGroup.getId(), sysUser.getId());
+            if(hasMemberGroup){
+                throw new BizException("乐团报名失败：您已在其他系统收费团");
+            }
         }
 
         if (date.compareTo(DateUtil.getLastTimeWithDay(musicGroup.getApplyExpireDate())) > 0 && studentRegistration.getId() == null) {