Revert "商品图片地址拼接前缀返回页面"

This reverts commit 86d5e1b6ee2b0a56204ede44d2b701e44c074348.

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsImageService.java

@@ -3,7 +3,6 @@ package com.sckw.product.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.sckw.core.model.constant.Global;
-import com.sckw.core.utils.CollectionUtils;
 import com.sckw.product.dao.KwpGoodsImageMapper;
 import com.sckw.product.model.KwpGoodsImage;
 import lombok.RequiredArgsConstructor;
@@ -46,8 +45,7 @@ public class KwpGoodsImageService {
         LambdaQueryWrapper<KwpGoodsImage> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(KwpGoodsImage::getGoodsId, goodsId).eq(KwpGoodsImage::getDelFlag, Global.NO)
                 .orderByAsc(KwpGoodsImage::getSort);
-        List<KwpGoodsImage> list = kwpGoodsImageMapper.selectList(wrapper);
-        return CollectionUtils.emptyIfNull(list);
+        return kwpGoodsImageMapper.selectList(wrapper);
     }
 
     /**

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -86,8 +86,6 @@ public class KwpGoodsService {
     private String pcGoodsListUrl;
     @Value("${goods.url.list.app}")
     private String appGoodsListUrl;
-    @Value("${filePathPrefix}")
-    private String pathPrefix;
 
 
     /**
@@ -220,8 +218,7 @@ public class KwpGoodsService {
             RecommendGoods recommendGoods = BeanUtils.copyProperties(e, RecommendGoods.class);
             List<KwpGoodsPriceRange> prices = map.get(recommendGoods.getId());
             recommendGoods.setUnitLabel(CollectionUtils.isNotEmpty(unitMap) ? unitMap.get(recommendGoods.getUnit()) : null)
-                    .setPrice(CollectionUtils.isNotEmpty(prices) ? prices.get(0).getPrice() : null)
-                    .setThumb(StringUtils.isNotEmpty(e.getThumb()) ? pathPrefix + e.getThumb() : null);
+                    .setPrice(CollectionUtils.isNotEmpty(prices) ? prices.get(0).getPrice() : null);
             recommendGoodsList.add(recommendGoods);
         });
         detail.setRecommendGoodsList(recommendGoodsList);
@@ -275,16 +272,7 @@ public class KwpGoodsService {
                 .setStatusLabel(CollectionUtils.isNotEmpty(goodsStatusMap) ? goodsStatusMap.get(String.valueOf(detail.getStatus())) : null)
                 .setPrepaidLimitLabel(Objects.equals(detail.getPrepaidLimit(), 1) ? "是" : "否");
         //商品图片信息
-        if (Objects.nonNull(goods.getThumb())) {
-            detail.setThumb(pathPrefix + goods.getThumb());
-        }
         List<KwpGoodsImage> goodsImages = kwpGoodsImageService.getByGoodsId(id);
-        goodsImages.forEach(e -> {
-            String image = e.getImage();
-            if (StringUtils.isNotEmpty(image)) {
-                e.setImage(pathPrefix + image);
-            }
-        });
         List<GoodsImagesDetail> images = BeanUtils.copyToList(goodsImages, GoodsImagesDetail.class);
         //商品价格段信息
         List<KwpGoodsPriceRange> priceRanges = kwpGoodsPriceRangeService.getByGoodsId(id);
@@ -720,7 +708,6 @@ public class KwpGoodsService {
                     .setAddress(addressMap.get(id)).setSupplyEnt(entMap.get(e.getSupplyEntId()))
                     .setManageName(Objects.nonNull(manager) ? manager.getName() : null)
                     .setPhone(Objects.nonNull(manager) ? manager.getPhone() : null)
-                    .setThumb(Objects.nonNull(e.getThumb()) ? pathPrefix + e.getThumb() : null)
                     .setCreateByName(Objects.nonNull(createUser) ? createUser.getName() : null);
             List<KwpGoodsPriceRange> priceRanges = priceRangeMap.get(id);
             if (CollectionUtils.isNotEmpty(priceRanges)) {
@@ -928,7 +915,6 @@ public class KwpGoodsService {
                     .setAddressName(Objects.isNull(address) ? null : address.getCityName())
                     .setDetailAddress(Objects.isNull(address) ? null : address.getDetailAddress())
                     .setPrice(CollectionUtils.isEmpty(priceRanges) ? null : priceRanges.get(0).getPrice())
-                    .setThumb(StringUtils.isNotEmpty(e.getThumb()) ? pathPrefix + e.getThumb() : null)
                     .setSupplyEnt(entMap.get(e.getSupplyEntId()));
             result.add(materials);
         });
@@ -1006,11 +992,7 @@ public class KwpGoodsService {
      * @return: java.util.List<com.sckw.product.model.KwpGoods>
      */
     public KwpGoods selectById(Long id) {
-        KwpGoods goods = kwpGoodsMapper.selectById(id);
-        if (Objects.nonNull(goods) && StringUtils.isNotBlank(goods.getThumb())) {
-            goods.setThumb(pathPrefix + goods.getThumb());
-        }
-        return goods;
+        return kwpGoodsMapper.selectById(id);
     }
 
 
@@ -1023,13 +1005,6 @@ public class KwpGoodsService {
      */
     public List<KwpGoods> selectByIds(List<Long> ids) {
         List<KwpGoods> list = kwpGoodsMapper.selectBatchIds(ids);
-        if (CollectionUtils.isNotEmpty(list)) {
-            list.forEach(e -> {
-                if (StringUtils.isNotBlank(e.getThumb())) {
-                    e.setThumb(pathPrefix + e.getThumb());
-                }
-            });
-        }
         return CollectionUtils.emptyIfNull(list);
     }