禁用源素材

src/main/java/com/ycwl/basic/service/impl/mobile/AppScenicServiceImpl.java

@@ -5,10 +5,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ycwl.basic.biz.OrderBiz;
 import com.ycwl.basic.constant.BaseContextHandler;
-import com.ycwl.basic.constant.NumberConstant;
 import com.ycwl.basic.mapper.*;
 import com.ycwl.basic.model.jwt.JwtInfo;
-import com.ycwl.basic.model.mobile.index.TopStateResp;
 import com.ycwl.basic.model.mobile.order.IsBuyRespVO;
 import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
 import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
@@ -16,14 +14,15 @@ import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;
 import com.ycwl.basic.model.mobile.scenic.account.ScenicLoginReq;
 import com.ycwl.basic.model.mobile.scenic.account.ScenicLoginRespVO;
 import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
-import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
 import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity;
+import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
 import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
 import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO;
 import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
 import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
 import com.ycwl.basic.model.pc.video.entity.MemberVideoEntity;
+import com.ycwl.basic.repository.ScenicRepository;
 import com.ycwl.basic.service.mobile.AppScenicService;
 import com.ycwl.basic.repository.TemplateRepository;
 import com.ycwl.basic.utils.ApiResponse;
@@ -71,6 +70,8 @@ public class AppScenicServiceImpl implements AppScenicService {
     private TemplateRepository templateRepository;
     @Autowired
     private OrderBiz orderBiz;
+    @Autowired
+    private ScenicRepository scenicRepository;
 
     @Override
     public ApiResponse<PageInfo<ScenicAppVO>> pageQuery(ScenicReqQuery scenicReqQuery) {
@@ -101,51 +102,6 @@ public class AppScenicServiceImpl implements AppScenicService {
         return ApiResponse.success(dataList);
     }
 
-    @Override
-    public ApiResponse<List<ContentPageVO>> contentList(Long faceId) {
-        JwtInfo worker = JwtTokenUtil.getWorker();
-
-        FaceRespVO faceRespVO = faceMapper.getById(faceId);
-        if (StringUtils.isBlank(faceRespVO.getMatchSampleIds())) {
-//            return ApiResponse.success(new ArrayList<>());
-        }
-
-        List<ContentPageVO> contentList = templateMapper.listFor(faceRespVO.getScenicId());
-        contentList.forEach(contentPageVO -> {
-            List<MemberVideoEntity> memberVideoEntityList = videoMapper.userFaceTemplateVideo(worker.getUserId(), faceId, contentPageVO.getTemplateId());
-            if (!memberVideoEntityList.isEmpty()) {
-                contentPageVO.setIsBuy(memberVideoEntityList.get(0).getIsBuy());
-                contentPageVO.setContentId(memberVideoEntityList.get(0).getVideoId());
-            }
-        });
-
-        SourceReqQuery sourceReqQuery = new SourceReqQuery();
-        sourceReqQuery.setScenicId(faceRespVO.getScenicId());
-        sourceReqQuery.setMemberId(worker.getUserId());
-        //查询源素材
-        List<SourceRespVO> sourceList = sourceMapper.listGroupByType(sourceReqQuery);
-        sourceList.forEach(sourceRespVO -> {
-            ContentPageVO contentPageVO = new ContentPageVO();
-            Integer type = sourceRespVO.getType();
-            if(type==1){
-                contentPageVO.setName("原片集");
-            } else {
-                contentPageVO.setName("照片集");
-            }
-            IsBuyRespVO isBuyRespVO = orderBiz.isBuy(worker.getUserId(), faceRespVO.getScenicId(), type, faceId);
-            contentPageVO.setSourceType(isBuyRespVO.getGoodsType());
-            contentPageVO.setContentId(isBuyRespVO.getGoodsId());
-            if (isBuyRespVO.isBuy()) {
-                contentPageVO.setIsBuy(1);
-            } else {
-                contentPageVO.setIsBuy(0);
-            }
-            contentPageVO.setContentType(2);
-            contentList.add(contentPageVO);
-        });
-
-        return ApiResponse.success(contentList);
-    }
     @Override
     public ApiResponse<List<ContentPageVO>> faceContentList(Long userId, Long faceId) {
         FaceRespVO faceRespVO = faceMapper.getById(faceId);
@@ -179,7 +135,19 @@ public class AppScenicServiceImpl implements AppScenicService {
         sourceReqQuery.setMemberId(userId);
         //查询源素材
         List<SourceRespVO> sourceList = sourceMapper.listGroupByType(sourceReqQuery);
-        sourceList.forEach(sourceRespVO -> {
+        ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(faceRespVO.getScenicId());
+        sourceList.stream().filter(item -> {
+            if (item.getType() == 1) {
+                if (Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) {
+                    return false;
+                }
+            } else if (item.getType() == 2) {
+                if (Integer.valueOf(1).equals(scenicConfig.getDisableSourceImage())) {
+                    return false;
+                }
+            }
+            return true;
+        }).forEach(sourceRespVO -> {
             ContentPageVO contentPageVO = new ContentPageVO();
             Integer type = sourceRespVO.getType();
             if(type==1){

src/main/java/com/ycwl/basic/service/mobile/AppScenicService.java

@@ -1,7 +1,6 @@
 package com.ycwl.basic.service.mobile;
 
 import com.github.pagehelper.PageInfo;
-import com.ycwl.basic.model.mobile.index.TopStateResp;
 import com.ycwl.basic.model.mobile.scenic.ScenicAppVO;
 import com.ycwl.basic.model.mobile.scenic.ScenicDeviceCountVO;
 import com.ycwl.basic.model.mobile.scenic.ScenicIndexVO;
@@ -34,7 +33,6 @@ public interface AppScenicService {
     ApiResponse<List<ScenicAppVO>> scenicList(ScenicIndexVO scenicIndexVO);
 
 
-    ApiResponse<List<ContentPageVO>> contentList(Long scenicId);
     ApiResponse<List<ContentPageVO>> faceContentList(Long userId, Long faceId);
 
     ApiResponse<ScenicLoginRespVO> login(ScenicLoginReq scenicLoginReq) throws Exception;