Merge branch 'master' into online1

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/MusicGroupPaymentCalenderDetailServiceImpl.java

@@ -127,7 +127,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 				push.put(userId, userId + "");
 			}
 			MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-			String memo = "4?http://mstudev.dayaedu.com/#/renew?musicGroupId=" + musicGroupId;
+			String memo = "4?http://mstuonline.dayaedu.com/#/renew?musicGroupId=" + musicGroupId;
 			// 发送续费通知
 			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/MusicGroupPaymentCalenderServiceImpl.java

@@ -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());