From c47c24a39a7544f8a1c125d2a52b2a1f97904a8d Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 21 Nov 2025 21:52:14 +0800 Subject: [PATCH] =?UTF-8?q?refactor(goods):=20=E7=A7=BB=E9=99=A4=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=8A=E5=85=B3=E8=81=94=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 GoodsService 中的 goodsList 接口定义 - 移除 GoodsServiceImpl 中 goodsList 方法的实现 - 清理相关导入语句和无用代码引用 - 简化商品服务模块，聚焦于源素材商品列表功能 --- .../basic/service/mobile/GoodsService.java | 7 -- .../service/mobile/impl/GoodsServiceImpl.java | 84 ------------------- 2 files changed, 91 deletions(-) diff --git a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java index 9e5b762a..2423a6b0 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java +++ b/src/main/java/com/ycwl/basic/service/mobile/GoodsService.java @@ -11,13 +11,6 @@ import java.util.List; */ public interface GoodsService { - /** - * 查询商品列表 - * @param query 查询条件 - * @return - */ - ApiResponse> goodsList(GoodsReqQuery query); - /** * 查询源素材商品列表 * 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 1327735f..bea75219 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 @@ -43,8 +43,6 @@ import com.ycwl.basic.repository.VideoRepository; import com.ycwl.basic.repository.VideoTaskRepository; import com.ycwl.basic.service.mobile.GoodsService; 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.model.repository.TaskUpdateResult; import com.ycwl.basic.service.task.TaskService; @@ -109,88 +107,6 @@ public class GoodsServiceImpl implements GoodsService { @Autowired private PrinterMapper printerMapper; - public ApiResponse> 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 goodsList = new ArrayList<>(); - VideoReqQuery videoReqQuery = new VideoReqQuery(); - videoReqQuery.setScenicId(scenicId); - videoReqQuery.setIsBuy(query.getIsBuy()); - videoReqQuery.setFaceId(query.getFaceId()); - //查询成片vlog - List 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 sourceList = sourceMapper.queryByRelation(sourceReqQuery); - ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId); - List sourceGoods = sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getFaceId)).entrySet().stream().flatMap((faceEntry) -> { - Long faceId = faceEntry.getKey(); - List 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 public List sourceGoodsList(GoodsReqQuery query) { FaceEntity face = faceRepository.getFace(query.getFaceId());