Merge branch 'fix/0711-music' into test

mec-application/src/main/java/com/ym/mec/teacher/controller/UserMusicController.java

@@ -74,7 +74,7 @@ public class UserMusicController  extends BaseController {
 
     @ApiOperation(value = "保存草稿/发布作品", notes = "用户曲目作品- 传入 UserMusicWrapper.UserMusic")
     @PostMapping("/save")
-    public HttpResponseResult<JSONObject> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
+    public HttpResponseResult<String> add(@Validated @RequestBody UserMusicWrapper.AddUserMusic userMusic) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null || null == user.getId()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
@@ -82,9 +82,7 @@ public class UserMusicController  extends BaseController {
         userMusic.setUserId(user.getId().longValue());
         userMusic.setClientType(ClientEnum.TEACHER);
         // 新增数据
-        userMusicService.save(userMusic);
-
-        return succeed();
+        return succeed(userMusicService.save(userMusic).toString());
     }
 
     @ApiOperation(value = "删除", notes = "用户曲目作品- 传入id")

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

@@ -524,7 +524,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 			LOGGER.error("接收地址不能为空");
 			return;
 		}
-		if("STUDENT".equals(jpushType) && type != STUDENT_PUSH_VIP_BUY){
+		if(messageSender == MessageSender.JIGUANG && "STUDENT".equals(jpushType) && type != STUDENT_PUSH_VIP_BUY){
 			//如果不是缴费信息
 			int hour = DateUtil.getHour(new Date());
 			//如果当前时间在22点之后