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

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupPaymentCalenderDetailServiceImpl.java

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -130,7 +130,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		SysNewsInformation info = new SysNewsInformation();
 		info.setOrder(1);
 
-		if (queryInfo.getTenantId() == 1 && date.after(startDate)) {
+		if (queryInfo.getTenantId() == 1 && date.after(startDate) && "18696158274".equals(user.getPhone()) == false) {
 			info.setCreateTime(date);
 			info.setUpdateTime(date);
 			if (isNewer) {

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

@@ -1765,7 +1765,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         TeachModeEnum teachMode = TeachModeEnum.OFFLINE;
-        if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE)){
+        if(classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) || classGroup.getType().equals(ClassGroupTypeEnum.MUSIC_NETWORK)){
             teachMode = TeachModeEnum.ONLINE;
         }
 

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

@@ -285,6 +285,14 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
 	@Transactional(rollbackFor = Exception.class)
 	public void exercisesSituationStatistics2(String monday) {
 		LocalDate nowDate = LocalDateTime.now(DateUtil.zoneId).toLocalDate();
+
+		if(nowDate.getDayOfWeek()==DayOfWeek.MONDAY){
+			int lastWeekTodayUpdateNum = studentExtracurricularExercisesSituationDao.findLastWeekTodayUpdateNum(nowDate.toString());
+			if(lastWeekTodayUpdateNum<=0){
+				nowDate = nowDate.plusDays(-1);
+			}
+		}
+
 		if(StringUtils.isNotBlank(monday)){
 			nowDate=LocalDate.parse(monday, DateUtil.dateFormatter);
 		}

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

@@ -134,7 +134,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						push.put(userId, userId + "");
 					}
 					MusicGroup musicGroup = musicGroupDao.get(musicGroupPaymentCalender.getMusicGroupId());
-					String memo = "4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
+					String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
 					// 发送续费通知
 					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
 							null, 0, memo, "STUDENT", musicGroup.getName());
@@ -224,7 +224,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 						push.put(userId, userId + "");
 					}
 					MusicGroup musicGroup = musicGroupDao.get(mgpc.getMusicGroupId());
-					String memo = "4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
+					String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
 					// 发送续费通知
 					sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push,
 							null, 0, memo, "STUDENT", musicGroup.getName());

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

@@ -70,7 +70,7 @@ public class MusicGroupStudentFeeServiceImpl extends BaseServiceImpl<Long, Music
 			for (MusicGroupStudentFee sf : updateList) {
 				push.put(sf.getUserId(), sf.getUserId() + "");
 			}
-			String memo = "4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
+			String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroup.getId();
 			// 发送续费通知
 			sysMessageService.batchSendMessage(MessageSender.JIGUANG, MessageTypeEnum.STUDENT_PUSH_WAIT_RENEW_MESSAGE, push, null, 0, memo,"STUDENT",musicGroup.getName());
 		}