q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改bug

Browse Source
This commit is contained in:
Jerry Yan
2025-01-03 13:58:15 +08:00
parent ade7193e64
commit c376e3b1b6
14 changed files with 70 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ 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.service.mobile.AppScenicService;
import com.ycwl.basic.template.repository.TemplateRepository;
import com.ycwl.basic.repository.TemplateRepository;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.JwtTokenUtil;
import lombok.extern.slf4j.Slf4j;

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

@@ -16,7 +16,7 @@ import com.ycwl.basic.model.pc.video.entity.VideoEntity;
import com.ycwl.basic.model.pc.video.req.VideoReqQuery;
import com.ycwl.basic.model.pc.video.resp.VideoRespVO;
import com.ycwl.basic.service.mobile.GoodsService;
import com.ycwl.basic.template.repository.TemplateRepository;
import com.ycwl.basic.repository.TemplateRepository;
import com.ycwl.basic.utils.ApiResponse;
import com.ycwl.basic.utils.DateUtils;
import org.apache.commons.lang3.StringUtils;
@@ -85,8 +85,7 @@ public class GoodsServiceImpl implements GoodsService {
List<GoodsPageVO> sourceGoods = sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getFaceId)).entrySet().stream().flatMap((faceEntry) -> {
Long faceId = faceEntry.getKey();
List<SourceRespVO> goods = faceEntry.getValue();
return goods.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).entrySet().stream().map((typeEntry) -> {
Integer type = typeEntry.getKey();
return goods.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).keySet().stream().map(type -> {
GoodsPageVO goodsPageVO = new GoodsPageVO();
goodsPageVO.setFaceId(faceId);
if (type == 1) {
@@ -252,7 +251,7 @@ public class GoodsServiceImpl implements GoodsService {
}
long nullTask = taskList.stream().filter(Objects::isNull).count();
if (nullTask > 0) {
response.setStatus(0);
response.setStatus(2);
return ApiResponse.success(response);
}
Optional<TaskEntity> taskEntity = taskList.stream().filter(task -> 1 == task.getStatus()).findFirst();
@@ -260,6 +259,7 @@ public class GoodsServiceImpl implements GoodsService {
response.setTemplateId(taskEntity.get().getTemplateId());
VideoEntity video = videoMapper.findByTaskId(taskEntity.get().getId());
response.setVideoId(video.getId());
response.setCount(taskList.size());
response.setStatus(1);
} else {
response.setStatus(2);
@@ -304,22 +304,25 @@ public class GoodsServiceImpl implements GoodsService {
response.setStatus(-2);
return ApiResponse.success(response);
}
response.setFaceId(faceVO.getId());
List<TaskEntity> taskList = videoMapper.listTaskByScenicRelation(userId, scenicId);
if (taskList.isEmpty()) {
response.setStatus(0);
return ApiResponse.success(response);
}
Optional<TaskEntity> taskEntity = taskList.stream().filter(task -> task.getStatus() == 1).findFirst();
if (taskEntity.isPresent()) {
response.setTemplateId(taskEntity.get().getTemplateId());
VideoEntity video = videoMapper.findByTaskId(taskEntity.get().getId());
response.setVideoId(video.getId());
response.setStatus(1);
} else {
response.setStatus(2);
}
return ApiResponse.success(response);
return getTaskStatusByFaceId(userId, faceVO.getId());
}
@Override
public ApiResponse<GoodsDetailVO> sourceGoodsInfo(Long userId, Long sourceId) {
SourceRespVO sourceRespVO = sourceMapper.listUserOne(userId, sourceId);
// if (sourceRespVO == null) {
// return ApiResponse.fail("该视频不属于你");
// }
GoodsDetailVO goodsDetailVO = new GoodsDetailVO();
goodsDetailVO.setGoodsName("原片");
goodsDetailVO.setScenicId(sourceRespVO.getScenicId());
goodsDetailVO.setScenicName(sourceRespVO.getScenicName());
goodsDetailVO.setGoodsType(0);
goodsDetailVO.setGoodsId(sourceRespVO.getId());
goodsDetailVO.setVideoUrl(sourceRespVO.getVideoUrl());
goodsDetailVO.setTemplateCoverUrl(sourceRespVO.getUrl());
goodsDetailVO.setCreateTime(sourceRespVO.getCreateTime());
return ApiResponse.success(goodsDetailVO);
}
}