You've already forked FrameTour-BE
refactor(goods): 移除商品列表查询接口及关联逻辑
- 删除 GoodsService 中的 goodsList 接口定义 - 移除 GoodsServiceImpl 中 goodsList 方法的实现 - 清理相关导入语句和无用代码引用 - 简化商品服务模块,聚焦于源素材商品列表功能
This commit is contained in:
@@ -11,13 +11,6 @@ import java.util.List;
|
|||||||
*/
|
*/
|
||||||
public interface GoodsService {
|
public interface GoodsService {
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询商品列表
|
|
||||||
* @param query 查询条件
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询源素材商品列表
|
* 查询源素材商品列表
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -43,8 +43,6 @@ import com.ycwl.basic.repository.VideoRepository;
|
|||||||
import com.ycwl.basic.repository.VideoTaskRepository;
|
import com.ycwl.basic.repository.VideoTaskRepository;
|
||||||
import com.ycwl.basic.service.mobile.GoodsService;
|
import com.ycwl.basic.service.mobile.GoodsService;
|
||||||
import com.ycwl.basic.repository.TemplateRepository;
|
import com.ycwl.basic.repository.TemplateRepository;
|
||||||
import com.ycwl.basic.repository.SourceRepository;
|
|
||||||
import com.ycwl.basic.biz.TemplateBiz;
|
|
||||||
import com.ycwl.basic.config.VideoUpdateConfig;
|
import com.ycwl.basic.config.VideoUpdateConfig;
|
||||||
import com.ycwl.basic.model.repository.TaskUpdateResult;
|
import com.ycwl.basic.model.repository.TaskUpdateResult;
|
||||||
import com.ycwl.basic.service.task.TaskService;
|
import com.ycwl.basic.service.task.TaskService;
|
||||||
@@ -109,88 +107,6 @@ public class GoodsServiceImpl implements GoodsService {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private PrinterMapper printerMapper;
|
private PrinterMapper printerMapper;
|
||||||
|
|
||||||
public ApiResponse<List<GoodsPageVO>> goodsList(GoodsReqQuery query) {
|
|
||||||
Long scenicId = query.getScenicId();
|
|
||||||
if (query.getFaceId() != null) {
|
|
||||||
FaceEntity face = faceRepository.getFace(query.getFaceId());
|
|
||||||
if (face == null) {
|
|
||||||
return ApiResponse.success(Collections.emptyList());
|
|
||||||
}
|
|
||||||
scenicId = face.getScenicId();
|
|
||||||
}
|
|
||||||
//查询原素材
|
|
||||||
List<GoodsPageVO> goodsList = new ArrayList<>();
|
|
||||||
VideoReqQuery videoReqQuery = new VideoReqQuery();
|
|
||||||
videoReqQuery.setScenicId(scenicId);
|
|
||||||
videoReqQuery.setIsBuy(query.getIsBuy());
|
|
||||||
videoReqQuery.setFaceId(query.getFaceId());
|
|
||||||
//查询成片vlog
|
|
||||||
List<VideoRespVO> videoList = videoMapper.queryByRelation(videoReqQuery);
|
|
||||||
videoList.forEach(videoRespVO -> {
|
|
||||||
GoodsPageVO goodsPageVO = new GoodsPageVO();
|
|
||||||
goodsPageVO.setGoodsName(videoRespVO.getTemplateName());
|
|
||||||
goodsPageVO.setScenicId(videoRespVO.getScenicId());
|
|
||||||
try {
|
|
||||||
ScenicV2DTO scenic = scenicRepository.getScenicBasic(videoRespVO.getScenicId());
|
|
||||||
goodsPageVO.setScenicName(scenic.getName());
|
|
||||||
} catch (Exception e) {
|
|
||||||
goodsPageVO.setScenicName("");
|
|
||||||
}
|
|
||||||
goodsPageVO.setGoodsType(0);
|
|
||||||
goodsPageVO.setFaceId(videoRespVO.getFaceId());
|
|
||||||
goodsPageVO.setGoodsId(videoRespVO.getId());
|
|
||||||
goodsPageVO.setTemplateName(videoRespVO.getTemplateName());
|
|
||||||
goodsPageVO.setTemplateCoverUrl(videoRespVO.getTemplateCoverUrl());
|
|
||||||
goodsList.add(goodsPageVO);
|
|
||||||
});
|
|
||||||
|
|
||||||
SourceReqQuery sourceReqQuery = new SourceReqQuery();
|
|
||||||
sourceReqQuery.setScenicId(scenicId);
|
|
||||||
sourceReqQuery.setIsBuy(query.getIsBuy());
|
|
||||||
sourceReqQuery.setFaceId(query.getFaceId());
|
|
||||||
//查询源素材
|
|
||||||
List<SourceRespVO> sourceList = sourceMapper.queryByRelation(sourceReqQuery);
|
|
||||||
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
|
|
||||||
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)).keySet().stream().filter(type -> {
|
|
||||||
if (Integer.valueOf(1).equals(type)) {
|
|
||||||
return !Boolean.TRUE.equals(scenicConfig.getBoolean("disable_source_video"));
|
|
||||||
} else if (Integer.valueOf(2).equals(type)) {
|
|
||||||
return !Boolean.TRUE.equals(scenicConfig.getBoolean("disable_source_image"));
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}).map(type -> {
|
|
||||||
GoodsPageVO goodsPageVO = new GoodsPageVO();
|
|
||||||
goodsPageVO.setFaceId(faceId);
|
|
||||||
goodsPageVO.setGoodsType(type);
|
|
||||||
if (type == 1) {
|
|
||||||
goodsPageVO.setGoodsName("录像集");
|
|
||||||
goodsPageVO.setTemplateCoverUrl(scenicConfig.getString("video_cover_url"));
|
|
||||||
} else if (type == 2) {
|
|
||||||
goodsPageVO.setGoodsName("照片集");
|
|
||||||
goodsPageVO.setTemplateCoverUrl(scenicConfig.getString("photo_cover_url"));
|
|
||||||
} else {
|
|
||||||
goodsPageVO.setGoodsName("未知商品");
|
|
||||||
}
|
|
||||||
if (StringUtils.isBlank(goodsPageVO.getTemplateCoverUrl())) {
|
|
||||||
goodsPageVO.setTemplateCoverUrl(goods.getFirst().getUrl());
|
|
||||||
}
|
|
||||||
goodsPageVO.setScenicId(query.getScenicId());
|
|
||||||
return goodsPageVO;
|
|
||||||
});
|
|
||||||
}).toList();
|
|
||||||
if (!sourceGoods.isEmpty()) {
|
|
||||||
if (goodsList.size() > 2) {
|
|
||||||
goodsList.addAll(2, sourceGoods);
|
|
||||||
} else {
|
|
||||||
goodsList.addAll(sourceGoods);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ApiResponse.success(goodsList);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<GoodsDetailVO> sourceGoodsList(GoodsReqQuery query) {
|
public List<GoodsDetailVO> sourceGoodsList(GoodsReqQuery query) {
|
||||||
FaceEntity face = faceRepository.getFace(query.getFaceId());
|
FaceEntity face = faceRepository.getFace(query.getFaceId());
|
||||||
|
|||||||
Reference in New Issue
Block a user