diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java index 067810e57..882cda541 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderInfoVO.java @@ -384,9 +384,6 @@ public class StoreOrderInfoVO { @ApiModelProperty(value = "更新时间") private Date updateTime; -// @ApiModelProperty(value = "档口商品名称") -// private String prodName; - @ApiModelProperty(value = "商品货号") private String prodArtNum; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java index 11d8fa129..c61b1f047 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/order/StoreOrderPageItemVO.java @@ -389,9 +389,6 @@ public class StoreOrderPageItemVO extends StoreOrderDTO { @ApiModelProperty(value = "更新时间") private Date updateTime; -// @ApiModelProperty(value = "档口商品名称") -// private String prodName; - @ApiModelProperty(value = "商品货号") private String prodArtNum; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackSimpleVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackSimpleVO.java index d69aee571..127fdc9b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackSimpleVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProd/PicPackSimpleVO.java @@ -28,4 +28,9 @@ public class PicPackSimpleVO { */ @ApiModelProperty(value = "文件大小(M)") private BigDecimal fileSize; + /** + * 文件类型（1主图、2视频、3下载） + */ + @ApiModelProperty(value = "文件类型[3:商品下载图片包 4:商品下载图片包450px 5:商品下载图片包750px]") + private Integer fileType; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java index a2557295a..31cbfd306 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreOrderDetail.java @@ -30,10 +30,6 @@ public class StoreOrderDetail extends SimpleEntity { * 商品ID */ private Long storeProdId; - /** - * 商品名称 - */ -// private String prodName; /** * 商品货号 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackSimpleDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackSimpleDTO.java index dc753bfd7..be9950eda 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackSimpleDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProduct/PicPackSimpleDTO.java @@ -22,4 +22,8 @@ public class PicPackSimpleDTO { * 文件大小(M) */ private BigDecimal fileSize; + /** + * 文件类型（1主图、2视频、3下载） + */ + private Integer fileType; } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java index 7c70bd162..4a598d7f1 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java @@ -67,8 +67,6 @@ public class StoreOrderServiceImpl implements IStoreOrderService { @Autowired private StoreProductColorSizeMapper storeProductColorSizeMapper; @Autowired - private StoreProductColorPriceMapper storeProductColorPriceMapper; - @Autowired private StoreColorMapper storeColorMapper; @Autowired private StoreProductColorMapper storeProductColorMapper; @@ -127,7 +125,6 @@ public class StoreOrderServiceImpl implements IStoreOrderService { StoreProduct sp = spMap.get(spcs.getStoreProdId()); StoreColor sc = scMap.get(spcs.getStoreColorId()); orderDetail.setStoreProdId(sp.getId()); -// orderDetail.setProdName(sp.getProdName()); orderDetail.setProdArtNum(sp.getProdArtNum()); orderDetail.setProdTitle(sp.getProdTitle()); orderDetail.setStoreColorId(sc.getId()); @@ -1836,14 +1833,8 @@ public class StoreOrderServiceImpl implements IStoreOrderService { * @return */ private BigDecimal calcPrice(Long orderUserId, StoreProductColorSize storeProductColorSize) { - - StoreProductColorPrice productColorPrice = storeProductColorPriceMapper.selectOne(Wrappers - .lambdaQuery(StoreProductColorPrice.class) - .eq(StoreProductColorPrice::getStoreProdId, storeProductColorSize.getStoreProdId()) - .eq(StoreProductColorPrice::getStoreColorId, storeProductColorSize.getStoreColorId()) - .eq(XktBaseEntity::getDelFlag, Constants.UNDELETED)); - Assert.notNull(productColorPrice, "无法获取商品定价"); - BigDecimal price = productColorPrice.getPrice(); + Assert.notNull(storeProductColorSize.getPrice(), "无法获取商品定价"); + BigDecimal price = storeProductColorSize.getPrice(); if (ProductSizeStatus.UN_STANDARD.getValue().equals(storeProductColorSize.getStandard())) { //非标准尺码 throw new ServiceException("商品尺码异常"); 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 4c0c5be21..9b79ee24e 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 @@ -590,25 +590,27 @@ public class StoreProductServiceImpl implements IStoreProductService { @Override public List prepareGetPicPackDownloadUrl(Long storeProductId) { Assert.notNull(storeProductId); - List fileIds = storeProdFileMapper.selectList(Wrappers.lambdaQuery(StoreProductFile.class) - .eq(StoreProductFile::getStoreProdId, storeProductId) - .in(StoreProductFile::getFileType, FileType.picPackValues()) - .eq(XktBaseEntity::getDelFlag, UNDELETED)) + List productFiles = storeProdFileMapper.selectList(Wrappers.lambdaQuery(StoreProductFile.class) + .eq(StoreProductFile::getStoreProdId, storeProductId) + .in(StoreProductFile::getFileType, FileType.picPackValues()) + .eq(XktBaseEntity::getDelFlag, UNDELETED)) .stream() - .map(StoreProductFile::getFileId) - .filter(Objects::nonNull) .collect(Collectors.toList()); - if (CollUtil.isEmpty(fileIds)) { + if (CollUtil.isEmpty(productFiles)) { return ListUtil.empty(); } // 商品下载量+1 redisCache.valueIncr(CacheConstants.PRODUCT_STATISTICS_DOWNLOAD_COUNT, storeProductId); - List files = fileMapper.selectByIds(fileIds); - return files.stream() - .filter(o -> UNDELETED.equals(o.getDelFlag())) + 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 -> { - PicPackSimpleDTO dto = BeanUtil.toBean(o, PicPackSimpleDTO.class); - dto.setFileId(o.getId()); + 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()); }