Merge branch 'dev_20221203'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AccountBizTypeEnum.java

@@ -17,7 +17,7 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     MUSIC("乐谱"),
     VIP("会员充值"),
     MALL("商品购买"),
-    PIAON_ROOM("琴房充值"),
+    PIANO_ROOM("琴房充值"),
     ACTI_REGIST("活动报名"),
     WITHDRAWAL("结算"),
     ALBUM("专辑"),

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/GoodTypeEnum.java

@@ -16,7 +16,7 @@ public enum GoodTypeEnum implements BaseEnum<String, GoodTypeEnum> {
     VIDEO("视频课购买"),
     MUSIC("单曲点播"),
     ALBUM("专辑购买"),
-    PINAO_ROOM("琴房时长"),
+    PIANO_ROOM("琴房时长"),
     ACTI_REGIST("活动报名")
     ;
 

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

@@ -163,7 +163,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         // 专辑购买
         orderCreate.put(GoodTypeEnum.ALBUM, musicSheetService::buyMusicSheetCheck);
         //琴房时长
-        orderCreate.put(GoodTypeEnum.PINAO_ROOM, pianoRoomBuyRecordService::orderCreate);
+        orderCreate.put(GoodTypeEnum.PIANO_ROOM, pianoRoomBuyRecordService::orderCreate);
         //活动报名
         orderCreate.put(GoodTypeEnum.ACTI_REGIST, activityPlanService::orderCreate);
 
@@ -187,7 +187,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         // 专辑购买
         orderSuccess.put(GoodTypeEnum.ALBUM, musicSheetService::buyMusicSheetSuccess);
         //琴房时长
-        orderSuccess.put(GoodTypeEnum.PINAO_ROOM, pianoRoomBuyRecordService::orderSuccess);
+        orderSuccess.put(GoodTypeEnum.PIANO_ROOM, pianoRoomBuyRecordService::orderSuccess);
         //活动报名
         orderSuccess.put(GoodTypeEnum.ACTI_REGIST, activityPlanService::orderSuccess);
 
@@ -780,7 +780,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_LIVE);
         } else if (GoodTypeEnum.MUSIC.equals(goodTypeEnum)) {
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_MUSIC);
-        } else if (GoodTypeEnum.PINAO_ROOM.equals(goodTypeEnum)) {
+        } else if (GoodTypeEnum.PIANO_ROOM.equals(goodTypeEnum)) {
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_PIANO_ROOM);
         } else if (GoodTypeEnum.ACTI_REGIST.equals(goodTypeEnum)) {
             configValue = sysConfigService.findConfigValue(SysConfigConstant.GOOD_LOGO_ACTI_REGIST);
@@ -969,9 +969,9 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
         BigDecimal platformFee = expectPrice.multiply(platformFeeRate).setScale(2, RoundingMode.HALF_UP);
         platformFee = platformFee.subtract(orderDetailVo.getCouponAmount());
         PlatformCashAccountRecord platformCashAccountRecord;
-        if (GoodTypeEnum.PINAO_ROOM.equals(orderDetailVo.getGoodType())) {
+        if (GoodTypeEnum.PIANO_ROOM.equals(orderDetailVo.getGoodType())) {
             platformCashAccountRecord = new PlatformCashAccountRecord(orderDetailVo.getUserId(), platformFee,
-                                                                      InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.PIAON_ROOM, orderDetailVo.getBizId(),
+                                                                      InOrOutEnum.IN, PostStatusEnum.RECORDED, AccountBizTypeEnum.PIANO_ROOM, orderDetailVo.getBizId(),
                                                                       orderDetailVo.getOrderNo(), new Date());
         } else {
             AccountBizTypeEnum bizTypeEnum = AccountBizTypeEnum.valueOf(orderDetailVo.getGoodType().getCode());
@@ -1089,7 +1089,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
      */
     private BigDecimal getPlatformFreeByGoodType(GoodTypeEnum goodType) {
         //会员|琴房时长，平台全额收益
-        if (GoodTypeEnum.VIP.equals(goodType) || GoodTypeEnum.PINAO_ROOM.equals(goodType)
+        if (GoodTypeEnum.VIP.equals(goodType) || GoodTypeEnum.PIANO_ROOM.equals(goodType)
                 || GoodTypeEnum.ACTI_REGIST.equals(goodType)) {
             return BigDecimal.ONE;
         }