酷乐秀曲目来源改为内容平台

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.req;
 
 
+import com.yonge.cooleshow.biz.dal.enums.AccompanimentTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.AudioTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -69,6 +70,8 @@ public class TeacherMusicSheetAuditReq {
     @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi,")
     private AudioTypeEnum audioType;
 
+    private AccompanimentTypeEnum accompanimentType;
+
     @ApiModelProperty(value = "音频文件存储路径")
     private String audioFileUrl;  //音频文件存储路径
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetAuthRecordServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayaedu.cbs.common.enums.music.EAudioType;
 import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
@@ -94,15 +95,14 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         addMusicSheet.setIsShowFingering(param.getShowFingering()==YesOrNoEnum.YES);
         addMusicSheet.setIsConvertibleScore(param.getNotation()==YesOrNoEnum.YES);
         addMusicSheet.setExtConfigJson(param.getExtConfigJson());
+        addMusicSheet.setAudioType(EAudioType.valueOf(param.getAccompanimentType().getCode()));
         musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
         MusicSheet musicSheet = musicSheetService.getById(musicSheetAuthRecord.getMusicSheetId());
         if (musicSheet == null) {
             throw new BizException("曲目信息不存在");
         }
-        musicSheet.setAuditStatus(param.getAuthStatus());
-        musicSheet.setUpdateBy(userId);
         if (param.getAuthStatus().equals(AuthStatusEnum.PASS)) {
-            musicSheetService.updateById(musicSheet);
+//            musicSheetService.updateById(musicSheet);
             // 修改老师标签
             teacherService.setTeacherTag(musicSheet.getUserId(), TeacherTagEnum.MUSIC);
             //同步到内容平台
@@ -120,6 +120,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             addMusicSheet.setIsUseSystemBeat(param.getHasBeat()!=YesOrNoEnum.YES);
             addMusicSheet.setId(musicSheet.getCbsMusicSheetId());
             addMusicSheet.setAvailableType(EMusicAvailableType.PLATFORM);
+            addMusicSheet.setUpdateBy(userId);
             //修改声部和乐器为内容平台id
             String musicalInstrumentIds = addMusicSheet.getMusicalInstrumentIds();
             List<Instrument> instruments = instrumentService.lambdaQuery().in(Instrument::getId, musicalInstrumentIds.split(",")).list();
@@ -130,6 +131,8 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                 throw new BizException("同步到内容平台失败");
             }
         }else {
+            musicSheet.setAuditStatus(param.getAuthStatus());
+            musicSheet.setUpdateBy(userId);
             musicSheetService.updateById(musicSheet);
         }
         this.updateById(musicSheetAuthRecord);

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -105,7 +105,7 @@
             (#{item.musicSheetId},
              #{item.musicTagIds},#{item.paymentType},#{item.paymentType},
              #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},0
-             ,CASE WHEN #{item.delFlag} THEN 'DOING' ELSE 'PASS' END
+             ,'PASS'
             ,#{item.musicSheetUpdate.name},
             #{item.musicSheetUpdate.subjectIds},
             #{item.musicSheetUpdate.musicSvg},
@@ -829,7 +829,7 @@
             ms.charge_type_ = #{item.paymentType},
             ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
             ms.exquisite_flag_ = #{item.exquisiteFlag},ms.sort_number_ = #{item.sortNo},ms.del_flag_ = 0,
-            ms.audit_status_ = CASE WHEN #{item.delFlag} THEN 'DOING' ELSE 'PASS' END,
+            ms.audit_status_ = 'PASS',
             ms.state_ = #{item.status}
             <if test="item.musicSheetUpdate != null">
                 ,ms.music_sheet_name_ = #{item.musicSheetUpdate.name},