Merge branch 'master' of http://git.dayaedu.com/yonge/mec

codegen/src/main/java/com/yonge/crud/CodegenApplication.java

@@ -28,7 +28,7 @@ public class CodegenApplication {
 		 */
 
 		// "src/generateConfigration.xml"
-		GenerateConfiguration genConfig = toObject("src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
+		GenerateConfiguration genConfig = toObject("codegen/src/main/resources/generateConfigration.xml", GenerateConfiguration.class);
 
 		Configuration config = genConfig.getDbConfiguration();
 

codegen/src/main/resources/generateConfigration.xml

@@ -4,7 +4,7 @@
 		<driverClass>com.mysql.jdbc.Driver</driverClass>
 		<url>jdbc:mysql://47.99.212.176:3306/edu_saas</url>
 		<username>edu_saas</username>
-		<password>edu_saas</password>
+		<password>dayaDataOnline@2019</password>
 		<catalog>edu_saas</catalog>
 		<schema>edu_saas</schema>
 	</dbConfiguration>

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

@@ -59,12 +59,14 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
         Date nowDate = new Date();
         //获取收费项价格
         SporadicChargeInfo chargeInfo = sporadicChargeInfoDao.get(degreeRegistration.getSporadicId());
-        if (chargeInfo == null) {
+        if (chargeInfo == null || chargeInfo.getDelFlag().equals(1) || chargeInfo.getOpenFlag().equals(1)) {
             throw new BizException("你选的考试级别不存在");
         }
-        if (chargeInfo.getTitle().equals("二级") && StringUtils.isBlank(degreeRegistration.getTheoryCert())) {
-            throw new BizException(chargeInfo.getTitle() + "考试必须上传证书");
+
+        if (!chargeInfo.getTitle().equals("一级") && !chargeInfo.getTitle().equals("二级") && StringUtils.isBlank(degreeRegistration.getTheoryCert())) {
+            throw new BizException("报考级别为"+chargeInfo.getTitle() + ",必须上传证书");
         }
+
         degreeRegistration.setLevel(chargeInfo.getTitle());
         BigDecimal theoryMoney = BigDecimal.ZERO;
         switch (degreeRegistration.getTheoryLevel()) {

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

@@ -1059,14 +1059,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			}
 		}
 
-		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
-
-		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
-			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
-			if(i<=0){
-				throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
-			}
-		}
+//		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId.longValue(), null);
+//
+//		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+//			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
+//			if(i<=0){
+//				throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
+//			}
+//		}
 
 		List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(),CourseSchedule.class);
 		courseScheduleService.checkNewCourseSchedules(courseSchedules,false);
@@ -1181,12 +1181,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         VipGroup vipGroup = vipGroupDao.get(vipGroupBuyParams.getVipGroupId());
 
 
-		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
-			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupBuyParams.getVipGroupId().toString(), GroupType.VIP);
-			if(i<=0){
-				throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
-			}
-		}
+//		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+//			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupBuyParams.getVipGroupId().toString(), GroupType.VIP);
+//			if(i<=0){
+//				throw new BizException("该课程已经无法通过购买加入，请联系教务老师!");
+//			}
+//		}
 
 		if(vipGroup.getPaymentExpireDate().before(date)){
 			throw new BizException("该课程已结束报名!");
@@ -2494,12 +2494,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, null);
 
-		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
-			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
-			if(i>0){
-				throw new BizException("该课程组学员为购买加入，无法添加学员加入，请走学员走购买流程!");
-			}
-		}
+//		if(classGroup.getStudentNum()>0&&(VipGroupStatusEnum.APPLYING.equals(vipGroup.getStatus()))){
+//			int i = studentPaymentOrderDao.countGroupOrderWithoutFailed(vipGroupId.toString(), GroupType.VIP);
+//			if(i>0){
+//				throw new BizException("已有学员购买了该课程组，无法添加，请走学员购买流程!");
+//			}
+//		}
 
 		if(VipGroupStatusEnum.PAUSE.equals(vipGroup.getStatus())
 				||VipGroupStatusEnum.FINISHED.equals(vipGroup.getStatus())

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -615,8 +615,11 @@
     <select id="countGroupOrderWithoutFailed" resultType="int">
         SELECT COUNT(*)
         FROM student_payment_order spo
+        LEFT JOIN class_group_student_mapper cgsm ON spo.music_group_id_=cgsm.music_group_id_ AND spo.user_id_=cgsm.user_id_
         WHERE spo.music_group_id_ = #{groupId}
         AND spo.status_ != 'FAILED'
+        AND cgsm.status_!= 'QUIT'
         AND spo.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
+        AND cgsm.group_type_ = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler }
     </select>
 </mapper>

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

@@ -112,6 +112,7 @@ public class DegreeController extends BaseController {
         queryInfo.setOrganId("42");
         queryInfo.setChargeType(SporadicChargeTypeEnum.LEVEL);
         queryInfo.setRows(99);
+        queryInfo.setOpenFlag(0);
         queryInfo.setSort("amount_");
         queryInfo.setOrder("ASC");
         return succeed(sporadicChargeInfoService.queryDetailPage(queryInfo));