Merge branch 'dev_20221203'

cooleshow-common/src/main/java/com/yonge/cooleshow/common/enums/RewardTypeEnum.java

@@ -13,7 +13,7 @@ public enum RewardTypeEnum implements BaseEnum<String, RewardTypeEnum> {
 
     ACTUAL("实物"),
     VIP("小酷AI会员"),
-    PIAMO_ROOM("琴房时长"),
+    PIANO_ROOM("琴房时长"),
     COUPON("优惠券"),
     ;
 

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

@@ -157,7 +157,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
         if (RewardTypeEnum.ACTUAL.equals(activityReward.getRewardType())) {
             activityReward.setNum(1);
             activityReward.setUnit(UnitEnum.PCS);
-        } else if (RewardTypeEnum.PIAMO_ROOM.equals(activityReward.getRewardType())) {
+        } else if (RewardTypeEnum.PIANO_ROOM.equals(activityReward.getRewardType())) {
             activityReward.setUnit(UnitEnum.MINUTE);
         }
 
@@ -313,7 +313,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
         if (activityReward == null) {
             throw new BizException("奖品不存在");
         }
-        if (activityReward.getRewardType().equals(RewardTypeEnum.PIAMO_ROOM)) {
+        if (activityReward.getRewardType().equals(RewardTypeEnum.PIANO_ROOM)) {
             // 琴房课时
             PianoRoomChangeRecord pianoRoomChangeRecord = new PianoRoomChangeRecord();
             pianoRoomChangeRecord.setUserId(userId);