|
|
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.beust.jcommander.internal.Lists;
|
|
|
import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
|
|
|
-import com.dayaedu.cbs.common.enums.music.EMusicPaymentType;
|
|
|
import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
|
|
|
import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
|
|
|
import com.dayaedu.cbs.openfeign.properties.OpenFeignClientConfigProperties;
|
|
|
@@ -1473,7 +1472,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
addMusicSheetApplicationExtend.setTopFlag(musicSheet.getTopFlag() != YesOrNoEnum.YES);
|
|
|
addMusicSheetApplicationExtend.setMusicTagIds(musicSheet.getMusicTag());
|
|
|
addMusicSheetApplicationExtend.setMusicPrice(musicSheet.getMusicPrice());
|
|
|
- addMusicSheetApplicationExtend.setPaymentType(EMusicPaymentType.valueOf(musicSheet.getPaymentType()));
|
|
|
+ addMusicSheetApplicationExtend.setPaymentType(musicSheet.getPaymentType());
|
|
|
addMusicSheetApplicationExtend.setAvailableType(EMusicAvailableType.valueOf("TEACHER".equals(musicSheet.getPaymentType()) ?
|
|
|
"PERSON" : "PLATFORM".equals(musicSheet.getPaymentType()) ? "PLATFORM":"ORG"));
|
|
|
addMusicSheetApplicationExtend.setTopFlag(musicSheet.getTopFlag() == YesOrNoEnum.YES);
|
|
|
@@ -1999,8 +1998,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
|
|
|
CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend applicationExtend = extend.get(0);
|
|
|
musicSheetAudit.setMusicTag(applicationExtend.getMusicTagIds());
|
|
|
if(applicationExtend.getPaymentType() != null){
|
|
|
- musicSheetAudit.setPaymentType(applicationExtend.getPaymentType().getCode());
|
|
|
- musicSheetAudit.setChargeType(ChargeTypeEnum.valueOf(applicationExtend.getPaymentType().getCode()));
|
|
|
+ musicSheetAudit.setPaymentType(applicationExtend.getPaymentType());
|
|
|
+ musicSheetAudit.setChargeType(ChargeTypeEnum.valueOf(applicationExtend.getPaymentType()));
|
|
|
}
|
|
|
if(applicationExtend.getTopFlag() != null){
|
|
|
musicSheetAudit.setTopFlag(applicationExtend.getTopFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
|
