下载不需要水印

This commit is contained in:
2025-07-18 14:23:22 +08:00
parent d7d503212f
commit f54595466a
4 changed files with 11 additions and 6 deletions

View File

@@ -613,7 +613,7 @@ public class GoodsServiceImpl implements GoodsService {
sourceReqQuery.setFaceId(query.getFaceId());
List<SourceRespVO> list = sourceMapper.listUser(sourceReqQuery);
if (query.getGoodsId() != null) {
list = list.stream().filter(source -> source.getId().equals(query.getGoodsId())).collect(Collectors.toList());
list = list.stream().filter(source -> source.getId().equals(query.getGoodsId())).toList();
}
if (!Integer.valueOf(2).equals(query.getSourceType())) {
return list.stream().map(source -> {
@@ -634,8 +634,8 @@ public class GoodsServiceImpl implements GoodsService {
}
return true;
}).count();
IsBuyRespVO isBuy = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), query.getSourceType(), face.getId());
if (count > 0) {
IsBuyRespVO isBuy = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), query.getSourceType(), face.getId());
if (!isBuy.isBuy()) {
return Collections.emptyList();
}
@@ -654,7 +654,7 @@ public class GoodsServiceImpl implements GoodsService {
log.warn("未配置小程序参数,无法生成二维码");
return defaultUrlList;
}
if (scenicConfig != null && scenicConfig.getWatermarkType() != null) {
if (scenicConfig != null && scenicConfig.getWatermarkType() != null && !isBuy.isBuy()) {
ImageWatermarkOperatorEnum type = ImageWatermarkOperatorEnum.getByCode(scenicConfig.getWatermarkType());
if (type != null) {
IStorageAdapter adapter;