新增默认谱面

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -266,7 +266,7 @@ public class MusicSheet implements Serializable {
 
 	@ApiModelProperty("谱面类型")
 	@TableField("score_type_")
-	private EDefaultScoreType scoreType;
+	private String scoreType;
 
 	public ChargeTypeEnum getChargeType() {
 		if (Objects.isNull(this.chargeType) && StringUtils.isNotEmpty(getPaymentType())) {

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

@@ -8,10 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.beust.jcommander.internal.Lists;
 import com.dayaedu.cbs.common.enums.EClientType;
-import com.dayaedu.cbs.common.enums.music.EAudioType;
-import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
-import com.dayaedu.cbs.common.enums.music.EMusicPlayMode;
-import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
+import com.dayaedu.cbs.common.enums.music.*;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.properties.OpenFeignClientConfigProperties;
@@ -528,7 +525,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         sheet.setMusicPrice(musicSheetApplication.getMusicPrice());
         sheet.setComposer(musicSheetApplication.getComposer());
         sheet.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
-        sheet.setScoreType(musicSheetApplication.getScoreType());
+        if(musicSheetApplication.getScoreType() != null){
+            sheet.setScoreType(musicSheetApplication.getScoreType().getCode());
+        }
         if (StringUtils.isNotEmpty(musicSheetApplication.getPlaySpeed())) {
             sheet.setPlaySpeed(musicSheetApplication.getPlaySpeed());
         }
@@ -1495,6 +1494,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 "PERSON" : "PLATFORM".equals(musicSheet.getPaymentType()) ? "PLATFORM":"ORG"));
         addMusicSheetApplicationExtend.setExquisiteFlag(musicSheet.getExquisiteFlag() == YesOrNoEnum.YES);
         addMusicSheetApplicationExtend.setSortNo(musicSheet.getSortNumber());
+        addMusicSheetApplicationExtend.setIsConvertibleScore(musicSheet.getNotation() == YesOrNoEnum.YES);
+        if(StringUtils.isNotEmpty(musicSheet.getScoreType())){
+            addMusicSheetApplicationExtend.setScoreType(EDefaultScoreType.valueOf(musicSheet.getScoreType()));
+        }
         R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendUpdate(addMusicSheetApplicationExtend);
         if (jsonObjectR.getCode() != 200) {
             throw new BizException("修改失败,{}",jsonObjectR.getMessage());

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

@@ -40,6 +40,7 @@
         <result column="music_sheet_type_" jdbcType="VARCHAR" property="musicSheetType"/>
         <result column="provider_type_" jdbcType="VARCHAR" property="providerType"/>
         <result column="cbs_music_sheet_id_" property="cbsMusicSheetId"/>
+        <result column="score_type_" property="scoreType"/>
     </resultMap>
 
     <sql id="Base_Column_List">