管乐迷曲目来源内容平台

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

@@ -81,9 +81,8 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			}
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
-				CbsMusicSheetWrapper.MusicSheetSound sheetSound = musicSheetApplication.getMusicSheetSoundList().get(i);
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
-				record.setId(sheetSound.getId().toString());
+				record.setId(accompaniment.getExamSongId().toString());
 				record.setType(accompaniment.getType());
 				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 				record.setClientType(accompaniment.getClientType());
@@ -128,7 +127,6 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 	public SysMusicScoreAccompaniment initSysMusicScoreAccompaniment(CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication,
 																	 CbsMusicSheetWrapper.MusicSheetSound sound){
 		SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
-		record.setId(sound.getId().toString());
 //		record.setType(accompaniment.getType());
 		record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 //		record.setClientType(accompaniment.getClientType());

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -2726,7 +2726,7 @@ public class RoomServiceImpl implements RoomService {
                         courseScheduleId, null, null, 0);
         CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
         query.setRows(1);
-        query.setMusicSheetSoundId(Long.parseLong(musicScoreData.getMusicScoreAccompanimentId()));
+        query.setMusicSheetIds(Lists.newArrayList(Long.parseLong(musicScoreData.getMusicScoreAccompanimentId())));
         List<CbsMusicSheetWrapper.MusicSheetApplication> applications = sysMusicScoreService.queryCbsMusicSheetApplication(query);
         if (CollectionUtils.isEmpty(applications)) {
             throw new BizException("曲目信息不存在");
@@ -2760,6 +2760,7 @@ public class RoomServiceImpl implements RoomService {
             courseScheduleStudentMusicScoreDao.batchInsert(scheduleStudentMusicScores);
         }
         SysMusicScoreAccompaniment accompaniment = sysMusicScoreAccompanimentService.initSysMusicScoreAccompaniment(sheetApplication, sheetSound);
+        accompaniment.setId(musicScoreData.getMusicScoreAccompanimentId());
         MusicScoreMessage musicScoreMessage = JSON.parseObject(JSON.toJSONString(accompaniment), MusicScoreMessage.class);
         // 发送消息
         String serviceProvider = getRoomServiceProvider(musicScoreData.getRoomId());
@@ -2841,9 +2842,9 @@ public class RoomServiceImpl implements RoomService {
         String accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
         List<CourseScheduleStudentMusicScore> studentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(accompanimentId, scheduleId, studentId, null, null);
         if (accompanimentId != null) {
-            CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
+            /*CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
             query.setRows(1);
-            query.setMusicSheetSoundId(Long.parseLong(accompanimentId));
+            query.setMusicSheetIds(Lists.newArrayList(Long.parseLong(accompanimentId)));
             List<CbsMusicSheetWrapper.MusicSheetApplication> applications = sysMusicScoreService.queryCbsMusicSheetApplication(query);
             if (CollectionUtils.isEmpty(applications)) {
                 throw new BizException("曲目信息不存在");
@@ -2858,7 +2859,7 @@ public class RoomServiceImpl implements RoomService {
             SysMusicScoreAccompaniment accompaniment = sysMusicScoreAccompanimentService.initSysMusicScoreAccompaniment(sheetApplication,sheetSound);
             if (accompaniment == null) {
                 throw new BizException("曲目信息不存在");
-            }
+            }*/
             //修改下载状态
             if (CollectionUtils.isEmpty(studentMusicScores)) {
                 throw new BizException("学员不存在此下载曲目");