瀏覽代碼

Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into develop

zouxuan 1 年之前
父節點
當前提交
944a995103

+ 1 - 10
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicAlbumServiceImpl.java

@@ -1,33 +1,23 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import java.math.BigDecimal;
-import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.ActivityPlanVo;
 import com.yonge.cooleshow.biz.dal.vo.ShareProfitVo;
-import com.yonge.cooleshow.biz.dal.dao.AlbumMusicRelateDao;
-import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
-import com.yonge.cooleshow.biz.dal.dao.MusicSheetPurchaseRecordDao;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.album.PurchaseRecordTypeEnum;
 import com.yonge.cooleshow.biz.dal.vo.StudentMusicAlbumOrderVo;
-import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantAlbumWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.enums.ActivityShareEnum;
@@ -551,6 +541,7 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         return album;
     }
 
+
     @Override
     public TenantAlbumWrapper.TenantAlbum tenantDetailAlbum(String albumId) {
         Long tenantAlbumId;

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

@@ -109,7 +109,7 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
     private PaymentDivMemberRecordService paymentDivMemberRecordService;
 
     @Autowired
-    private StudentService studentService;
+    private TenantAlbumMusicService tenantAlbumMusicService;
 
 
     @Autowired
@@ -963,6 +963,23 @@ public class UserPaymentCoreServiceImpl implements UserPaymentCoreService {
         if (payTypeReq.getClientType().equals(ClientEnum.TENANT)) {
             resp.setPaymentVersion(EPaymentVersion.V2);
         }
+        //检查曲目数量
+        if(payTypeReq.getGoodType() == GoodTypeEnum.MUSIC){
+            //机构专辑曲目数
+            List<TenantAlbumMusic> tenantAlbumMusiclist = tenantAlbumMusicService.lambdaQuery().eq(TenantAlbumMusic::getTenantAlbumId, payTypeReq.getBizId())
+                    .eq(TenantAlbumMusic::getDelFlag,false).list();
+            List<Long> musicSheetIds = tenantAlbumMusiclist.stream().map(TenantAlbumMusic::getMusicSheetId).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(musicSheetIds)){
+                Integer count = musicSheetService.lambdaQuery().in(MusicSheet::getId, musicSheetIds)
+                        .eq(MusicSheet::getState, true)
+                        .eq(MusicSheet::getDelFlag, false).count();
+                if(count < 1){
+                    throw new BizException("当前教程不可购买");
+                }
+            }else {
+                throw new BizException("当前教程不可购买");
+            }
+        }
         // 检测商品是属于老师,老师是否设置的结算给机构
 
         switch (payTypeReq.getGoodType()) {