支持别人看我的照片信息

src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java

@@ -15,20 +15,16 @@ import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
 import com.ycwl.basic.model.pc.member.entity.MemberEntity;
 import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
 import com.ycwl.basic.model.pc.video.entity.VideoEntity;
-import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
 import com.ycwl.basic.repository.VideoRepository;
-import com.ycwl.basic.repository.VideoTaskRepository;
 import com.ycwl.basic.service.mobile.AppScenicService;
 import com.ycwl.basic.service.mobile.GoodsService;
 import com.ycwl.basic.service.pc.FaceService;
 import com.ycwl.basic.service.task.impl.TaskTaskServiceImpl;
-import com.ycwl.basic.utils.ApiResponse;
 import com.ycwl.basic.utils.SnowFlakeUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -224,8 +220,9 @@ public class LyCompatibleController {
                     return map;
                 }).collect(Collectors.toList());
         GoodsReqQuery goodsReqQuery = new GoodsReqQuery();
+        goodsReqQuery.setFaceId(faceVO.getId());
         goodsReqQuery.setSourceType(1);
-        List<GoodsDetailVO> sourceGoodsList = goodsService.sourceGoodsList(member.getId(), goodsReqQuery);
+        List<GoodsDetailVO> sourceGoodsList = goodsService.sourceGoodsList(goodsReqQuery);
         List<Map<String, Object>> userVideoList = sourceGoodsList.stream().map(goodsDetailVO -> {
             Map<String, Object> map = new HashMap<>();
             map.put("id", goodsDetailVO.getGoodsId().toString());

src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java

@@ -1,7 +1,6 @@
 package com.ycwl.basic.controller.mobile;
 
 import com.ycwl.basic.annotation.IgnoreToken;
-import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.exception.CheckTokenException;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.goods.*;
@@ -37,7 +36,7 @@ public class AppGoodsController {
     @ApiOperation("源素材(原片/照片)商品列表")
     @PostMapping("/sourceGoodsList")
     public ApiResponse<List<GoodsDetailVO>> sourceGoodsList(@RequestBody GoodsReqQuery query) {
-        List<GoodsDetailVO> goodsDetailVOS = goodsService.sourceGoodsList(Long.valueOf(BaseContextHandler.getUserId()), query);
+        List<GoodsDetailVO> goodsDetailVOS = goodsService.sourceGoodsList(query);
         return ApiResponse.success(goodsDetailVOS);
     }
 

src/main/java/com/ycwl/basic/mapper/SourceMapper.java

@@ -55,6 +55,7 @@ public interface SourceMapper {
     int addRelations(List<MemberSourceEntity> list);
 
     int updateRelation(MemberSourceEntity memberSourceEntity);
+    int updateWaterUrl(MemberSourceEntity memberSourceEntity);
 
     List<SourceRespVO> queryByRelation(SourceReqQuery sourceReqQuery);
 

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

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -137,12 +138,16 @@ public class GoodsServiceImpl implements GoodsService {
     }
 
     @Override
-    public List<GoodsDetailVO> sourceGoodsList(Long userId, GoodsReqQuery query) {
+    public List<GoodsDetailVO> sourceGoodsList(GoodsReqQuery query) {
+        FaceEntity face = faceRepository.getFace(query.getFaceId());
+        if (face == null) {
+            return Collections.emptyList();
+        }
         Integer sourceType = query.getSourceType();
         SourceReqQuery sourceReqQuery = new SourceReqQuery();
         sourceReqQuery.setScenicId(query.getScenicId());
         sourceReqQuery.setIsBuy(query.getIsBuy());
-        sourceReqQuery.setMemberId(userId);
+        sourceReqQuery.setMemberId(face.getMemberId());
         sourceReqQuery.setType(sourceType);
         sourceReqQuery.setFaceId(query.getFaceId());
         List<SourceRespVO> list = sourceMapper.listUser(sourceReqQuery);

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

@@ -21,11 +21,10 @@ public interface GoodsService {
     /**
      * 查询源素材商品列表
      *
-     * @param userId
      * @param query
      * @return
      */
-    List<GoodsDetailVO> sourceGoodsList(Long userId, GoodsReqQuery query);
+    List<GoodsDetailVO> sourceGoodsList(GoodsReqQuery query);
 
     /**
      * @param userId  商品（vlog）id