From 8ef2ef4b15a8196c579eea071c45302030d8c349 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Tue, 22 Apr 2025 10:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=81=BF=E5=85=8D=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E3=80=81=E6=B0=B4=E5=8D=B0=E5=B9=B6=E5=8F=91=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E8=AE=A9=E5=89=8D=E7=AB=AF=E6=9B=B4=E5=A5=BD=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=A4=A7=E9=94=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/pc/scenic/resp/ScenicConfigResp.java | 4 ++-- .../mobile/impl/AppScenicServiceImpl.java | 16 ++++++++++++++++ .../service/mobile/impl/GoodsServiceImpl.java | 2 +- .../basic/service/pc/impl/OrderServiceImpl.java | 4 ++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java index bd37c70..c5c5119 100644 --- a/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java +++ b/src/main/java/com/ycwl/basic/model/pc/scenic/resp/ScenicConfigResp.java @@ -43,6 +43,6 @@ public class ScenicConfigResp { private Integer userSourceExpireDay; private BigDecimal brokerDirectRate; - private String imageSourcePackHint; - private String videoSourcePackHint; + private String imageSourcePackHint = ""; + private String videoSourcePackHint = ""; } diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java index 2f5cc75..dbdbf40 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppScenicServiceImpl.java @@ -20,6 +20,7 @@ import com.ycwl.basic.model.pc.scenic.entity.ScenicAccountEntity; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery; import com.ycwl.basic.model.pc.scenic.resp.ScenicRespVO; +import com.ycwl.basic.model.pc.source.entity.SourceEntity; import com.ycwl.basic.model.pc.source.req.SourceReqQuery; import com.ycwl.basic.model.pc.source.resp.SourceRespVO; import com.ycwl.basic.model.pc.task.entity.TaskEntity; @@ -29,6 +30,7 @@ import com.ycwl.basic.repository.ScenicRepository; import com.ycwl.basic.repository.VideoRepository; import com.ycwl.basic.repository.VideoTaskRepository; import com.ycwl.basic.service.mobile.AppScenicService; +import com.ycwl.basic.service.pc.SourceService; import com.ycwl.basic.utils.ApiResponse; import com.ycwl.basic.utils.JwtTokenUtil; import lombok.extern.slf4j.Slf4j; @@ -73,6 +75,8 @@ public class AppScenicServiceImpl implements AppScenicService { private VideoTaskRepository videoTaskRepository; @Autowired private VideoRepository videoRepository; + @Autowired + private SourceService sourceService; @Override public ApiResponse> pageQuery(ScenicReqQuery scenicReqQuery) { @@ -166,6 +170,12 @@ public class AppScenicServiceImpl implements AppScenicService { } else { sourceImageContent.setIsBuy(0); } + List sourceEntities = sourceMapper.listImageByFaceRelation(faceRespVO.getMemberId(), faceId); + if (!sourceEntities.isEmpty()) { + sourceImageContent.setLockType(-1); + } else { + sourceImageContent.setLockType(1); + } contentList.add(sourceImageContent); } if (!Integer.valueOf(1).equals(scenicConfig.getDisableSourceVideo())) { @@ -177,6 +187,12 @@ public class AppScenicServiceImpl implements AppScenicService { } else { sourceVideoContent.setIsBuy(0); } + List sourceEntities = sourceMapper.listVideoByFaceRelation(faceRespVO.getMemberId(), faceId); + if (!sourceEntities.isEmpty()) { + sourceVideoContent.setLockType(-1); + } else { + sourceVideoContent.setLockType(1); + } contentList.add(sourceVideoContent); } sourceList.stream().collect(Collectors.groupingBy(SourceRespVO::getType)).forEach((type, list) -> { 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 5574950..4238c70 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 @@ -522,7 +522,7 @@ public class GoodsServiceImpl implements GoodsService { } IOperator operator = ImageWatermarkFactory.get(ImageWatermarkOperatorEnum.WATERMARK); List watermarkEntityList = sourceMapper.listSourceWatermark(defaultUrlList.stream().map(GoodsUrlVO::getGoodsId).collect(Collectors.toList()), null, ImageWatermarkOperatorEnum.WATERMARK.getType()); - List collect = defaultUrlList.stream().peek(item -> { + List collect = defaultUrlList.stream().parallel().peek(item -> { Optional any = watermarkEntityList.stream() .filter(watermark -> watermark.getSourceId().equals(item.getGoodsId())) .findAny(); diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java index f92a874..267fd6a 100644 --- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java @@ -173,8 +173,8 @@ public class OrderServiceImpl implements OrderService { goods.setCreateTime(sourceEntity.getCreateTime()); goodsList.add(goods); } + item.setShootingTime(memberVideoEntityList.get(0).getCreateTime()); } - item.setShootingTime(memberVideoEntityList.get(0).getCreateTime()); } } else if (Integer.valueOf(2).equals(item.getGoodsType())) { // 照片 goodsId就是人脸ID List memberVideoEntityList = sourceMapper.listImageByFaceRelation(byId.getMemberId(), item.getGoodsId()); @@ -195,8 +195,8 @@ public class OrderServiceImpl implements OrderService { goods.setCreateTime(sourceEntity.getCreateTime()); goodsList.add(goods); } + item.setShootingTime(memberVideoEntityList.get(0).getCreateTime()); } - item.setShootingTime(memberVideoEntityList.get(0).getCreateTime()); } } else { item.setCoverList(Collections.singletonList(item.getCoverUrl()));