diff --git a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java index 4bac49a..1ffb44b 100644 --- a/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java +++ b/src/main/java/com/ycwl/basic/controller/extern/LyCompatibleController.java @@ -14,8 +14,10 @@ import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO; 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.task.entity.TaskEntity; import com.ycwl.basic.model.pc.video.entity.VideoEntity; 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; @@ -62,6 +64,8 @@ public class LyCompatibleController { private TaskTaskServiceImpl taskTaskServiceImpl; @Autowired private RedisTemplate redisTemplate; + @Autowired + private VideoTaskRepository videoTaskRepository; @PostMapping("sendPhoto") @IgnoreToken @@ -209,6 +213,11 @@ public class LyCompatibleController { Map map = new HashMap<>(); VideoEntity videoRespVO = videoRepository.getVideo(contentPageVO.getContentId()); map.put("id", videoRespVO.getId().toString()); + map.put("task_id", videoRespVO.getTaskId().toString()); + TaskEntity task = videoTaskRepository.getTaskById(videoRespVO.getTaskId()); + if (task != null) { + map.put("face_id", String.valueOf(task.getFaceId())); + } map.put("template_cover_image", contentPageVO.getTemplateCoverUrl()); Date taskShotDate = taskTaskServiceImpl.getTaskShotDate(videoRespVO.getTaskId()); map.put("shoottime", DateUtil.format(taskShotDate, "yyyy-MM-dd HH:mm")); @@ -225,7 +234,7 @@ public class LyCompatibleController { List> userVideoList = sourceGoodsList.stream().map(goodsDetailVO -> { Map map = new HashMap<>(); map.put("id", goodsDetailVO.getGoodsId().toString()); - map.put("face_id", goodsDetailVO.getFaceId().toString()); + map.put("face_id", String.valueOf(goodsDetailVO.getFaceId())); map.put("openid", openId); map.put("template_cover_image", goodsDetailVO.getUrl()); map.put("scenicname", goodsDetailVO.getScenicName()); @@ -235,6 +244,7 @@ public class LyCompatibleController { }).collect(Collectors.toList()); response .put("isgen", taskStatusVO.getStatus() == 1 ? 0 : 1) + .put("member_id", faceVO.getMemberId().toString()) .put("face_id", faceVO.getId().toString()) .put("newvideo", videoList) .put("newuservideo", userVideoList); diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java index 32e5fce..6a6399c 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/GoodsServiceImpl.java @@ -210,6 +210,7 @@ public class GoodsServiceImpl implements GoodsService { goodsDetailVO.setScenicId(sourceRespVO.getScenicId()); goodsDetailVO.setScenicName(sourceRespVO.getScenicName()); goodsDetailVO.setGoodsType(sourceType); + goodsDetailVO.setFaceId(face.getId()); goodsDetailVO.setGoodsId(sourceRespVO.getId()); goodsDetailVO.setIsFree(sourceRespVO.getIsFree()); goodsDetailVO.setIsBuy(sourceRespVO.getIsBuy());