Merge branch 'dev_v1.3.6_20221021'

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

@@ -1214,13 +1214,13 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         MusicSheetDetailVo musicSheet = detail(musicSheetId, null, null);
 
         YesOrNoEnum discount = YesOrNoEnum.NO;
-        if (ChargeTypeEnum.VIP.equals(musicSheet.getChargeType())) {
+        if (musicSheet.getPaymentType().contains(ChargeTypeEnum.VIP.getCode())) {
             ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.VIP, sysUser.getId());
             if (activityPlanVo != null) {
                 result.setActivityId(activityPlanVo.getId());
                 discount = YesOrNoEnum.YES;
             }
-        } else if (ChargeTypeEnum.CHARGE.equals(musicSheet.getChargeType())) {
+        } else if (musicSheet.getPaymentType().contains(ChargeTypeEnum.CHARGE.getCode())) {
             ActivityPlanVo activityPlanVo = activityPlanService.activityShare(ActivityShareEnum.MUSIC_SHEET,
                                                                               sysUser.getId());
             if (activityPlanVo != null) {