From 3c32eb61bbd157a2620f21d9c4d8926c1509c68e Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 9 Oct 2025 11:06:01 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=88=A0=E6=8E=89=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=95=86=E5=93=81?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E8=BF=94=E5=9B=9E=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/StoreProductController.java | 9 ------ .../StoreProdPcDownloadInfoResVO.java | 2 ++ .../StoreProdPcDownloadInfoResDTO.java | 2 ++ .../xkt/service/IStoreProductService.java | 8 ----- .../service/impl/StoreProductServiceImpl.java | 30 ++----------------- .../mapper/StoreProductFileMapper.xml | 1 + 6 files changed, 7 insertions(+), 45 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java index 5e489602a..077311717 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java @@ -150,13 +150,6 @@ public class StoreProductController extends XktBaseController { return R.ok(BeanUtil.toBean(storeProdService.getPcDownloadInfo(storeProdId), StoreProdPcDownloadInfoResVO.class)); } - @ApiOperation(value = "获取商品图包列表", httpMethod = "GET", response = R.class) - @GetMapping(value = "/pic-pack/{storeProdId}") - public R> listPickPack(@PathVariable("storeProdId") Long storeProdId) { - List dtoList = storeProdService.prepareGetPicPackDownloadUrl(storeProdId); - return success(BeanUtil.copyToList(dtoList, PicPackSimpleVO.class)); - } - @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,seller,agent')") @Log(title = "获取商品图包下载链接", businessType = BusinessType.OTHER) @ApiOperation(value = "获取商品图包下载链接", httpMethod = "POST", response = R.class) @@ -169,6 +162,4 @@ public class StoreProductController extends XktBaseController { } - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPcDownloadInfoResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPcDownloadInfoResVO.java index c8592a10d..9184b6004 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPcDownloadInfoResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/StoreProdPcDownloadInfoResVO.java @@ -28,6 +28,8 @@ public class StoreProdPcDownloadInfoResVO { @Data public static class SPPDIFileVO { + @ApiModelProperty(value = "文件id") + private Long fileId; @ApiModelProperty(value = "文件名称") private String fileName; @ApiModelProperty(value = "文件路径") diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPcDownloadInfoResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPcDownloadInfoResDTO.java index a4294faff..d8ebdb3b3 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPcDownloadInfoResDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/StoreProdPcDownloadInfoResDTO.java @@ -29,6 +29,8 @@ public class StoreProdPcDownloadInfoResDTO { @Data public static class SPPDIFileDTO { + @ApiModelProperty(value = "文件id") + private Long fileId; @ApiModelProperty(value = "文件名称") private String fileName; @ApiModelProperty(value = "文件路径") diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java index b45f68c49..a9a8e5cd2 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java @@ -139,14 +139,6 @@ public interface IStoreProductService { */ List fuzzyQueryLatest30List(Long storeId, String prodArtNum); - /** - * 准备获取图包下载链接 - * - * @param storeProductId - * @return - */ - List prepareGetPicPackDownloadUrl(Long storeProductId); - /** * 获取图包下载链接（提供给前端请求使用） * diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index 77f47fca3..67dd9f9e8 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -19,7 +19,6 @@ import com.github.pagehelper.PageInfo; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.XktBaseEntity; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; @@ -635,33 +634,6 @@ public class StoreProductServiceImpl implements IStoreProductService { .setStoreProdId(x.getId()).setProdArtNum(x.getProdArtNum())).collect(Collectors.toList()); } - @Transactional(readOnly = true) - @Override - public List prepareGetPicPackDownloadUrl(Long storeProductId) { - Assert.notNull(storeProductId); - List productFiles = storeProdFileMapper.selectList(Wrappers.lambdaQuery(StoreProductFile.class) - .eq(StoreProductFile::getStoreProdId, storeProductId) - .in(StoreProductFile::getFileType, FileType.picPackValues()) - .eq(XktBaseEntity::getDelFlag, UNDELETED)); - if (CollUtil.isEmpty(productFiles)) { - return ListUtil.empty(); - } - // 商品下载量+1 - redisCache.valueIncr(CacheConstants.PRODUCT_STATISTICS_DOWNLOAD_COUNT, storeProductId); - List fileIds = productFiles.stream().map(StoreProductFile::getFileId).collect(Collectors.toList()); - Map fileMaps = fileMapper.selectByIds(fileIds) - .stream() - .collect(Collectors.toMap(SysFile::getId, Function.identity())); - return productFiles.stream() - .map(o -> { - SysFile sysFile = fileMaps.get(o.getFileId()); - PicPackSimpleDTO dto = BeanUtil.toBean(sysFile, PicPackSimpleDTO.class); - dto.setFileId(sysFile.getId()); - dto.setFileType(o.getFileType()); - return dto; - }).collect(Collectors.toList()); - } - @Transactional(readOnly = true) @Override public PicPackInfoDTO getPicPackDownloadUrl(PicPackReqDTO picPackReqDTO) { @@ -739,6 +711,8 @@ public class StoreProductServiceImpl implements IStoreProductService { @Override @Transactional(readOnly = true) public StoreProdPcDownloadInfoResDTO getPcDownloadInfo(Long storeProdId) { + // 商品下载量+1 + redisCache.valueIncr(CacheConstants.PRODUCT_STATISTICS_DOWNLOAD_COUNT, storeProdId); StoreProdPcDownloadInfoResDTO downloadInfo = this.storeProdMapper.selectDownloadProdInfo(storeProdId); // 获取下载图包 return downloadInfo.setFileList(this.storeProdFileMapper.selectDownloadFileList(storeProdId)); diff --git a/xkt/src/main/resources/mapper/StoreProductFileMapper.xml b/xkt/src/main/resources/mapper/StoreProductFileMapper.xml index f4ed653e1..93739b334 100644 --- a/xkt/src/main/resources/mapper/StoreProductFileMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductFileMapper.xml @@ -172,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"