From d308ef9bcaef2f53c4f4487605c8ddc29ec1d4b2 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Tue, 17 Dec 2024 10:31:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ycwl/basic/controller/mobile/AppGoodsController.java  | 2 ++
 .../com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java | 1 +
 src/main/java/com/ycwl/basic/task/VideoPieceGetter.java       | 4 +++-
 src/main/resources/mapper/VideoMapper.xml                     | 4 +++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java
index e8de970..f334452 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/AppGoodsController.java
@@ -1,5 +1,6 @@
 package com.ycwl.basic.controller.mobile;
 
+import com.ycwl.basic.constant.BaseContextHandler;
 import com.ycwl.basic.model.jwt.JwtInfo;
 import com.ycwl.basic.model.mobile.goods.*;
 import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
@@ -39,6 +40,7 @@ public class AppGoodsController {
     @ApiOperation("源素材(原片/照片)商品列表")
     @PostMapping("/sourceGoodsList")
     public ApiResponse<List<GoodsDetailVO>> sourceGoodsList(@RequestBody GoodsReqQuery query) {
+        query.setMemberId(Long.valueOf(BaseContextHandler.getUserId()));
         return goodsService.sourceGoodsList(query);
     }
 
diff --git a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java
index 2d9008c..8ba84cf 100644
--- a/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/impl/task/TaskTaskServiceImpl.java
@@ -230,6 +230,7 @@ public class TaskTaskServiceImpl implements TaskService {
                 }
                 VideoPieceGetter.Task task = new VideoPieceGetter.Task();
                 task.setFaceSampleId(sample.getId());
+                task.setMemberId(faceRespVO.getMemberId());
                 task.setDeviceId(sample.getDeviceId());
                 task.setCreateTime(sample.getCreateAt());
                 return task;
diff --git a/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java b/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java
index bf47771..ef4e16d 100644
--- a/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java
+++ b/src/main/java/com/ycwl/basic/task/VideoPieceGetter.java
@@ -55,6 +55,7 @@ public class VideoPieceGetter {
         public Long faceSampleId;
         public Date createTime;
         public Callback callback;
+        public Long memberId;
 
         public static interface Callback {
             void onInvoke();
@@ -124,11 +125,12 @@ public class VideoPieceGetter {
         log.info("视频裁切成功");
         try {
             InputStream inputStream = new FileInputStream(outFile);
-            String url = ossUtil.uploadFile(inputStream, "user-video-source", outFile.getName());
+            String url = ossUtil.uploadFile(inputStream, "user-video-source/", outFile.getName());
             SourceEntity sourceEntity = new SourceEntity();
             sourceEntity.setId(SnowFlakeUtil.getLongId());
             sourceEntity.setVideoUrl(url);
             sourceEntity.setFaceSampleId(faceSample.getId());
+            sourceEntity.setMemberId(task.getMemberId());
             sourceEntity.setScenicId(faceSample.getScenicId());
             sourceEntity.setDeviceId(faceSample.getDeviceId());
             sourceEntity.setType(1);
diff --git a/src/main/resources/mapper/VideoMapper.xml b/src/main/resources/mapper/VideoMapper.xml
index 994fb9f..a178fae 100644
--- a/src/main/resources/mapper/VideoMapper.xml
+++ b/src/main/resources/mapper/VideoMapper.xml
@@ -49,8 +49,10 @@
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.video.resp.VideoRespVO">
         select v.id, v.scenic_id, member_id, template_id, task_id, worker_id, video_url, v.create_time, v.update_time,
-        t.name templateName,t.price templatePrice,v.is_buy isBuy
+        t.name templateName,t.price templatePrice,v.is_buy isBuy,
+        s.name scenicName
         from video v
+        left join scenic s on v.scenic_id = s.id
         left join template t on v.template_id = t.id
         where v.id = #{id}
     </select>