From 515febc28dd30ba343143600e21d1f78be12a0c3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 10 May 2022 15:40:43 +0800
Subject: [PATCH] fix goods-list and details interface

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
index b7fc216..35dfc36 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java
@@ -10,6 +10,7 @@
 import cc.mrbird.febs.mall.service.IApiMallGoodsService;
 import cc.mrbird.febs.mall.vo.MallGoodsDetailsVo;
 import cc.mrbird.febs.mall.vo.MallGoodsListVo;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -47,9 +48,11 @@
         List<String> images = goodsImagesMapper.selectGoodsImagesByGoodsId(mallGoods.getId());
         MallGoodsDetailsVo mallGoodsDetailsVo = MallGoodsConversion.INSTANCE.entityToDetailsVo(mallGoods);
 
-        Map<String, BigDecimal> stockAndVolume = this.baseMapper.selectGoodsStockAndVolume(id);
-        mallGoodsDetailsVo.setStock(stockAndVolume.get("stock").intValue());
-        mallGoodsDetailsVo.setVolume(stockAndVolume.get("volume").intValue());
+        if (CollUtil.isNotEmpty(mallGoods.getStyles())) {
+            Map<String, BigDecimal> stockAndVolume = this.baseMapper.selectGoodsStockAndVolume(id);
+            mallGoodsDetailsVo.setStock(stockAndVolume.get("stock").intValue());
+            mallGoodsDetailsVo.setVolume(stockAndVolume.get("volume").intValue());
+        }
         mallGoodsDetailsVo.setImages(images);
         return mallGoodsDetailsVo;
     }

--
Gitblit v1.9.1