Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -1593,10 +1593,10 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         studentMemberUpdateLog.setBuyType(param.getType());
         //保存学员会员时间
         studentMemberTimeService.saveToStudentMemberUpdateLog(studentMemberUpdateLog);
-        studentDao.updateCloudTeacherEndTime(userId);
         studentMemberUpdateLog.setName(memberRankSettingService.queryMemberName(param.getMemberRankId()));
         //添加修改日志
         studentMemberUpdateLogDao.insert(studentMemberUpdateLog);
+        studentDao.updateCloudTeacherEndTime(userId);
         if(param.getPushFlag()){
             //推送消息
             //您获得/扣减了XXXX{数量+周期}的XXXX{学练宝版本}，原因：XXXXX{添加/扣减原因}

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

@@ -2997,7 +2997,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
                 Map<Integer, String> map = new HashMap<>(1);
                 map.put(userId, userId.toString());
-                String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
+                String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL_MDAYA);
 
                 String pushUrl = baseApiUrl + "/#/myOrder";
                 sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,