Merge branch 'system_fee' into apply_multi_order

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

@@ -352,7 +352,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalender.setMusicGroupId(musicGroupId);
 			musicGroupPaymentCalender.setMusicGroupOrganizationCourseSettingId(musicGroupPaymentCalenderDto.getMusicGroupOrganizationCourseSettingId());
 
-			BigDecimal totalPaymentAmount = BigDecimal.ZERO;
+			BigDecimal totalPaymentAmount = musicGroupPaymentCalenderDto.getMasterTotalPrice();
 			if(musicGroupPaymentCalenderCourseSettingsList != null){
 				List<MusicGroupPaymentCalenderCourseSettings> newCSList = new ArrayList<MusicGroupPaymentCalenderCourseSettings>(
 						musicGroupPaymentCalenderCourseSettingsList.size());

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

@@ -217,41 +217,6 @@ public class MusicGroupSchoolTermCourseDetailServiceImpl extends BaseServiceImpl
 					null,
 					"STUDENT",pushMemberRenew);
 		}
-		//会员结束前5天提醒学员续费(退团提醒)
-		/*String pushMemberRenewQuit = sysConfigDao.findConfigValue(SysConfigService.PUSH_MEMBER_RENEW_QUIT);
-		if(StringUtils.isEmpty(pushMemberRenewQuit)){
-			pushMemberRenewQuit = "5";
-		}
-		//会员结束后3天学员自动退团
-		String memberEndAutoQuitMusic = sysConfigDao.findConfigValue(SysConfigService.MEMBER_END_AUTO_QUIT_MUSIC);
-		if(StringUtils.isEmpty(memberEndAutoQuitMusic)){
-			memberEndAutoQuitMusic = "3";
-		}
-		List<Integer> studentIdList = studentDao.queryPushMemberRenew(pushMemberRenewQuit);
-		if(studentIdList.size() > 0){
-			Map<Integer, String> studentPhoneMap = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(StringUtils.join(studentIdList,",")));
-			Map<Integer,String> userMap = new HashMap<>(studentIdList.size());
-			Map<Integer,String> userMap1 = new HashMap<>(studentIdList.size());
-			for (Integer studentId : studentIdList) {
-				userMap.put(studentId,studentPhoneMap.get(studentId));
-				userMap1.put(studentId,studentId.toString());
-			}
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
-					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
-					userMap,
-					null,
-					0,
-					null,
-					null,pushMemberRenewQuit,memberEndAutoQuitMusic);
-
-			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-					MessageTypeEnum.STUDENT_MEMBER_RENEW_QUIT_MESSAGE,
-					userMap1,
-					null,
-					0,
-					null,
-					"STUDENT",pushMemberRenewQuit,memberEndAutoQuitMusic);
-		}*/
 	}
 
 	private MusicGroupSchoolTermCourseDetail getCourseDetail(MusicGroupSchoolTermCourseDetail courseDetail){

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

@@ -928,6 +928,10 @@ public class StudentServeServiceImpl implements StudentServeService {
             MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
             if(musicGroup != null){
                 result.put("courseViewType", CourseViewTypeEnum.MEMBER_FEE);
+            }else {
+                List<BasicUserDto> students = courseScheduleStudentPaymentDao.findStudents(courseScheduleId);
+                Set<Integer> collect = students.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+                result.put("memberNum", studentDao.getMemberNum(StringUtils.join(collect,",")));
             }
             localDate=LocalDateTime.ofInstant(courseSchedule.getClassDate().toInstant(), DateUtil.zoneId).toLocalDate();
             List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);

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

@@ -831,7 +831,7 @@
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
                 AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)
@@ -863,7 +863,7 @@
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN student_visit sv ON sv.student_id_ = sr.user_id_ AND sv.purpose_ = '会员续费'
         <include refid="queryMusicMemberListSql"/>
-        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         <if test="hasMember != null">
             <if test="hasMember == 0">
                 AND (MAX(cto.id_) IS NULL OR DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0)
@@ -879,7 +879,7 @@
     </select>
     <sql id="queryMusicMemberListSql">
         <where>
-            sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 1
+            sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ = 1
             AND mg.status_ = 'PROGRESS'
             <if test="search != null and search != ''">
                 AND (mg.name_ LIKE CONCAT('%',#{search},'%') OR mg.id_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})

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

@@ -94,6 +94,6 @@
 	</select>
     <select id="queryPushCourseTermMusicIds" resultType="java.lang.String">
 		SELECT music_group_id_ FROM music_group_school_term_course_detail
-		GROUP BY music_group_id_ HAVING DATEDIFF(MAX(end_school_term_),NOW()) = #{remindCourseTime}
+		GROUP BY music_group_id_ HAVING DATEDIFF(NOW(),MAX(end_school_term_)) = #{remindCourseTime}
 	</select>
 </mapper>

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

@@ -735,7 +735,10 @@
         SELECT COUNT(0) FROM student WHERE member_rank_setting_id_ IS NOT NULL AND FIND_IN_SET(user_id_,#{studentIdsStr})
     </select>
     <select id="queryPushMemberRenew" resultType="java.lang.Integer">
-        SELECT user_id_ FROM student WHERE DATEDIFF(membership_end_time_,NOW()) = #{pushMemberRenew};
+        SELECT s.user_id_ FROM student s
+        LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = s.user_id_ AND cto.status_ IN (1,2)
+        GROUP BY s.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
+        AND DATEDIFF(MAX(cto.end_time_),NOW()) = #{pushMemberRenew}
     </select>
 
     <update id="updateGrade"><![CDATA[

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

@@ -1540,7 +1540,7 @@
         SELECT sr.music_group_id_,sr.user_id_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         LEFT JOIN cloud_teacher_order cto ON cto.student_id_ = sr.user_id_ AND cto.status_ IN (1,2)
-        WHERE sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 1
+        WHERE sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ = 1
         AND mg.status_ = 'PROGRESS'
         <if test="educationUserId != null">
             AND mg.educational_teacher_id_ = #{educationUserId}
@@ -1548,7 +1548,7 @@
         <if test="organIds != null and organIds != ''">
             AND FIND_IN_SET(mg.organ_id_,#{organIds})
         </if>
-        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) != 1)
+        GROUP BY sr.user_id_ HAVING (MAX(cto.id_) IS NULL OR MIN(cto.status_) > 1)
         <if test="memberEndAutoQuitMusic != null">
             AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
         </if>

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

@@ -468,7 +468,7 @@ public class TaskController extends BaseController {
 		}
 	}
 
-	@ApiOperation("每天10点推送排课、续费、退团提醒")
+	@ApiOperation("每天10点推送排课、续费提醒")
 	@GetMapping(value = "/musicSchoolTermPush")
 	public void musicSchoolTermPush() {
 		musicGroupSchoolTermCourseDetailService.musicSchoolTermPush();