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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentRegistrationDao.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
+import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
 import com.ym.mec.biz.dal.entity.StudentRegistration;
 import com.ym.mec.biz.dal.enums.PaymentStatusEnum;
 import com.ym.mec.common.dal.BaseDAO;
@@ -64,7 +65,7 @@ public interface StudentRegistrationDao extends BaseDAO<Long, StudentRegistratio
      * @param musicGroupId
      * @return
      */
-    List<Map<Integer, Long>> getNoClassStuCountBySubjectId(@Param("musicGroupId") String musicGroupId);
+     List<MusicGroupSubjectPlan> getNoClassStuCountByMusicGroupId(@Param("musicGroupId") String musicGroupId);
 
     /**
      * 根据乐团id和user_id 更新

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

@@ -9,10 +9,7 @@ import com.ym.mec.biz.dal.dto.StudentApplyDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDetailDto;
 import com.ym.mec.biz.dal.dto.StudentFeeDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.page.StudentRegistrationQueryInfo;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
@@ -61,7 +58,7 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
 	 * @param musicGroupId
 	 * @return
 	 */
-	List<Map<Integer,Long>> getNoClassStuCountBySubjectId(String musicGroupId);
+	List<MusicGroupSubjectPlan> getNoClassStuCountByMusicGroupId(String musicGroupId);
 
 	/**
 	 * 根据user_id 和 乐团id更新

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

@@ -269,7 +269,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 						.collect(Collectors.collectingAndThen(Collectors.toCollection(()
 								-> new TreeSet<CourseSchedule>(Comparator.comparing(o -> o.getStartClassTime() + "-" + o.getEndClassTime()))), ArrayList::new));
 				if(collect2.size()!=currentCourses.size()){
-					throw new BizException("课程安排上存在在同一时间开课的课程");
+					throw new BizException("建课失败，当前课程安排与现有课程冲突，请调整相关设置");
 				}
 			}else{
 				for(Date keyDate2:collect1.keySet()){

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

@@ -47,11 +47,16 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     @Override
     public List<MusicGroupSubjectPlan> getMusicSubjectClassPlan(String musicGroupId) {
         List<MusicGroupSubjectPlan> musicSubjectClassPlans = musicGroupSubjectPlanDao.getMusicSubjectClassPlan(musicGroupId);
-        List<Map<Integer, Long>> noClassStuCountBySubjectIds = studentRegistrationService.getNoClassStuCountBySubjectId(musicGroupId);
-        Map<Integer, Long> map = MapUtil.convertMybatisMap(noClassStuCountBySubjectIds);
+        List<MusicGroupSubjectPlan> noClassStuCounts = studentRegistrationService.getNoClassStuCountByMusicGroupId(musicGroupId);
+
         for (MusicGroupSubjectPlan musicSubjectClassPlan : musicSubjectClassPlans) {
-            Long aLong = map.get(musicSubjectClassPlan.getSubjectId());
-            musicSubjectClassPlan.setNoClassStudentNum(aLong==null?0:aLong.intValue());
+            for (MusicGroupSubjectPlan noClassStuCount : noClassStuCounts) {
+                if (!noClassStuCount.getSubjectId().equals(musicSubjectClassPlan.getSubjectId())) continue;
+                musicSubjectClassPlan.setNoClassStudentNum(noClassStuCount.getNoClassStudentNum());
+            }
+            if (musicSubjectClassPlan.getNoClassStudentNum() == null) {
+                musicSubjectClassPlan.setNoClassStudentNum(0);
+            }
         }
         return musicSubjectClassPlans;
     }
@@ -106,7 +111,7 @@ public class MusicGroupSubjectPlanServiceImpl extends BaseServiceImpl<Integer, M
     }
 
     @Override
-    public void addApplyStudentNum(String musicGroupId, Integer subjectId,int num) {
+    public void addApplyStudentNum(String musicGroupId, Integer subjectId, int num) {
         MusicGroupSubjectPlan musicOneSubjectClassPlan = musicGroupSubjectPlanDao.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
         int applyNum = musicOneSubjectClassPlan.getApplyStudentNum() == null ? 0 : musicOneSubjectClassPlan.getApplyStudentNum();
         musicOneSubjectClassPlan.setApplyStudentNum(applyNum + num);

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

@@ -133,8 +133,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
-    public List<Map<Integer, Long>> getNoClassStuCountBySubjectId(String musicGroupId) {
-        return studentRegistrationDao.getNoClassStuCountBySubjectId(musicGroupId);
+    public List<MusicGroupSubjectPlan> getNoClassStuCountByMusicGroupId(String musicGroupId) {
+        return studentRegistrationDao.getNoClassStuCountByMusicGroupId(musicGroupId);
     }
 
     @Override

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

@@ -108,7 +108,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		}
 
 	    if(vipGroup.getCourseSchedules().size()!=(vipGroup.getVipGroupApplyBaseInfo().getOfflineClassesNum()+vipGroup.getVipGroupApplyBaseInfo().getOnlineClassesNum())){
-	        throw new BizException("课时总数不匹配!");
+	        throw new BizException("建课失败，当前课程存在未排课课程，请调整相关设置");
         }
 
 		Map<TeachModeEnum, List<CourseSchedule>> courseScheduleGroup = null;
@@ -120,12 +120,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		if((Objects.isNull(courseScheduleGroup.get(TeachModeEnum.OFFLINE))&&vipGroup.getVipGroupApplyBaseInfo().getOfflineClassesNum()!=0)
 				||(!Objects.isNull(courseScheduleGroup.get(TeachModeEnum.OFFLINE))&&(courseScheduleGroup.get(TeachModeEnum.OFFLINE).size()<vipGroup.getVipGroupApplyBaseInfo().getOfflineClassesNum()))){
-	        throw new BizException("线下课课时数量安排有误!");
+	        throw new BizException("线下课课时数量安排有误");
         }
 
         if((Objects.isNull(courseScheduleGroup.get(TeachModeEnum.ONLINE))&&vipGroup.getVipGroupApplyBaseInfo().getOnlineClassesNum()!=0)
 				||(!Objects.isNull(courseScheduleGroup.get(TeachModeEnum.ONLINE))&&(courseScheduleGroup.get(TeachModeEnum.ONLINE).size()<vipGroup.getVipGroupApplyBaseInfo().getOnlineClassesNum()))){
-            throw new BizException("线上课课时数量安排有误!");
+            throw new BizException("线上课课时数量安排有误");
         }
 
 		SysUser sysUser = sysUserFeignService.queryUserById(vipGroup.getVipGroupApplyBaseInfo().getUserId());
@@ -219,12 +219,18 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
+		classGroupTeacherMapper.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
+		classGroupTeacherMapper.setClassGroupId(classGroup.getId());
 		classGroupTeacherMapper.setTeacherRole(TeachTypeEnum.BISHOP);
 		classGroupTeacherMapper.setUserId(vipGroupApplyBaseInfoDto.getUserId());
+		classGroupTeacherMapper.setCreateTime(now);
+		classGroupTeacherMapper.setUpdateTime(now);
 		classGroupTeacherMapperDao.insert(classGroupTeacherMapper);
 
 		//创建班级与老师课酬记录
 		ClassGroupTeacherSalary classGroupTeacherSalary=new ClassGroupTeacherSalary();
+		classGroupTeacherSalary.setMusicGroupId(vipGroupApplyBaseInfoDto.getId().toString());
+		classGroupTeacherSalary.setClassGroupId(classGroup.getId());
 		classGroupTeacherSalary.setTeacherRole(TeachTypeEnum.BISHOP);
 		classGroupTeacherSalary.setUserId(vipGroupApplyBaseInfoDto.getUserId());
 		classGroupTeacherSalary.setSalary(vipGroupApplyBaseInfoDto.getOfflineTeacherSalary());

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

@@ -290,14 +290,14 @@
         </if>
     </select>
 
+    <resultMap type="com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan" id="getNoClassStuCountByMusicGroupId">
+        <result column="actual_subject_id_" property="subjectId"/>
+        <result column="nums" property="noClassStudentNum"/>
+    </resultMap>
     <!-- 根据乐团和声部获取未分班人数 -->
-    <select id="getNoClassStuCountBySubjectId" resultType="map">
-        SELECT COUNT(DISTINCT sr.user_id_) `value`,sr.actual_subject_id_ `key` FROM student_registration sr
-        WHERE sr.user_id_ NOT IN (
-        SELECT DISTINCT cgsm.user_id_ FROM class_group_student_mapper cgsm
-        LEFT JOIN class_group cg ON cg.id_ = cgsm.class_group_id_
-        WHERE cg.music_group_id_ = #{musicGroupId})
-        AND sr.music_group_id_ = #{musicGroupId} GROUP BY sr.actual_subject_id_
+    <select id="getNoClassStuCountByMusicGroupId" resultMap="getNoClassStuCountByMusicGroupId">
+        SELECT actual_subject_id_ ,COUNT(*) nums FROM student_registration
+        WHERE music_group_id_ = #{musicGroupId} AND payment_status_=2 AND class_group_id_=0 GROUP BY actual_subject_id_;
     </select>
 
     <update id="updateByUserIdAndMusicGroupId" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
@@ -307,7 +307,7 @@
 
     <update id="batchUpdateSubject">
         UPDATE student_registration SET actual_subject_id_ = #{subId},update_time_ = now()
-        WHERE user_id_ = #{userIds} AND payment_status_ = 0 AND music_group_id_ = #{musicGroupId}
+        WHERE user_id_ = #{userId} AND payment_status_ = 0 AND music_group_id_ = #{musicGroupId}
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">

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

@@ -124,7 +124,7 @@
 	<select id="queryPage" resultMap="VipGroupActivity" parameterType="map">
 		SELECT
 		vga.*,
-		(NOW() BETWEEN start_time_ AND end_time_) enable,
+		(NOW() &lt; end_time_) enable,
 		GROUP_CONCAT(vgc.name_) vip_group_category_names_
 		FROM vip_group_activity vga
 		LEFT JOIN vip_group_category vgc ON FIND_IN_SET(vgc.id_,vga.vip_group_category_id_list_)
@@ -145,6 +145,7 @@
 			vip_group_activity
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
+			AND NOW() &lt; end_time_
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">
 		SELECT vga.id_ `key`,vga.name_ `value` FROM vip_group_activity vga WHERE FIND_IN_SET(vga.id_,#{activityIds})

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -31,10 +31,10 @@ import com.ym.mec.thirdparty.exception.ThirdpartyException;
 @Service
 public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBean {
 
-	@Value("${eseal.tsign.projectid:1111563517}")
+	@Value("${eseal.tsign.projectid:4438776254}")
 	public String projectId; // = "1111563517";
 
-	@Value("${eseal.tsign.projectSecret:95439b0863c241c63a861b87d1e647b7}")
+	@Value("${eseal.tsign.projectSecret:a94cf63d6361084d232f345d71321691}")
 	public String projectSecret; // = "95439b0863c241c63a861b87d1e647b7";
 
 	@Value("${eseal.tsign.apisUrl:http://smlitsm.tsign.cn:8080/tgmonitor/rest/app!getAPIInfo2}")