Merge branch 'dev_v1.3.5_20220929' into dev_v1.3.5_20220927

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

@@ -20,6 +20,7 @@ public enum AccountBizTypeEnum implements BaseEnum<String, AccountBizTypeEnum> {
     PIAON_ROOM("琴房充值"),
     ACTI_REGIST("活动报名"),
     WITHDRAWAL("结算"),
+    ALBUM("专辑"),
 
     LIVE_SHARE("直播课分润"),
     VIDEO_SHARE("视频课分润"),

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

@@ -8,7 +8,7 @@ import com.yonge.toolset.base.enums.BaseEnum;
  */
 public enum PurchaseRecordTypeEnum implements BaseEnum<String, PurchaseRecordTypeEnum> {
 
-    MUSIC("单曲"),
+    MUSIC("曲目"),
     ALBUM("专辑"),
     ;
     @EnumValue

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

@@ -46,6 +46,7 @@ import javax.annotation.Resource;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.text.MessageFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -747,7 +748,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 .eq(MusicSheetPurchaseRecord::getOrderStatus, OrderStatusEnum.PAID)
                 .list();
         if (!CollectionUtils.isEmpty(list)) {
-            throw new BizException("已经购买了当前曲目");
+            throw new BizException(MessageFormat.format("已经购买了当前{0}", purchaseType.getMsg()));
         }
     }
 

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

@@ -894,7 +894,7 @@ public class UserOrderServiceImpl extends ServiceImpl<UserOrderDao, UserOrder> i
             orderDetailVo.setRecomUserId(detail.getRecomUserId());
             orderDetailVo.setActivityId(detail.getActivityId());
             orderDetailVo.setRewardId(detail.getRewardId());
-
+            orderDetailVo.setOrderType(detail.getOrderType());
             //调用业务
             Consumer<UserOrderDetailVo> userOrderVoConsumer = orderSuccess.get(orderDetailVo.getGoodType());
             if (!Objects.isNull(userOrderVoConsumer)) {