Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

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

@@ -1617,8 +1617,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 if (Objects.isNull(album)) {
                     throw new BizException("无效的专辑信息");
                 }
-
-                userOrderDetail.setMerchId(0L);
                 userOrderDetail.setBizId(album.getId());
                 userOrderDetail.setOriginalPrice(BigDecimal.valueOf(album.getAlbumPrice()));
                 userOrderDetail.setExpectPrice(BigDecimal.valueOf(album.getAlbumPrice()));

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

@@ -531,6 +531,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
                 // 填充商品基础信息，校验参数合法以性
                 orderGoodsCreate.get(item.getGoodType()).accept(item);
                 UserOrderDetail userOrderDetail = item.getUserOrderDetail();
+                userOrderDetail.setMerchId(orderReq.getRecomUserId());
                 orderDetails.add(userOrderDetail);
                 // 根据优惠券计算实际优惠金额
                 // 计算优惠券金额
@@ -964,7 +965,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
             resp.setPaymentVersion(EPaymentVersion.V2);
         }
         //检查曲目数量
-        if(payTypeReq.getGoodType() == GoodTypeEnum.MUSIC){
+        if(payTypeReq.getGoodType() == GoodTypeEnum.TENANT_ALBUM){
             //机构专辑曲目数
             List<TenantAlbumMusic> tenantAlbumMusiclist = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantAlbumId, payTypeReq.getBizId())
                     .eq(TenantAlbumMusic::getDelFlag,false).list();