From 31caa96bc740697c01812ec8382b492b309bab93 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 24 Sep 2021 17:10:25 +0800
Subject: [PATCH] fix

---
 src/main/resources/mapper/modules/MallGoodsMapper.xml                       |    8 ++++++++
 src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java               |    5 +++++
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallGoodsServiceImpl.java |    6 ++++++
 3 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java
index b850a34..9e11a7f 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallGoodsMapper.java
@@ -10,6 +10,9 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
+import java.util.Map;
+
 public interface MallGoodsMapper extends BaseMapper<MallGoods> {
 
     IPage<MallGoodsListVo> selectMallGoodsListQueryInPage(@Param("record") MallGoodsQueryDto queryDto, Page<MallGoodsListVo> page);
@@ -23,4 +26,6 @@
     Integer selectMallGoodsCountByGoodsNo(@Param("goodsNo")String goodsNo);
 
     AdminMailGoodsDetailVo selectMallGoodsInfoById(@Param("id")long id);
+
+    Map<String, BigDecimal> selectGoodsStockAndVolume(@Param("id") Long id);
 }
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 7471bf9..b7fc216 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
@@ -17,7 +17,9 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author wzy
@@ -44,6 +46,10 @@
         }
         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());
         mallGoodsDetailsVo.setImages(images);
         return mallGoodsDetailsVo;
     }
diff --git a/src/main/resources/mapper/modules/MallGoodsMapper.xml b/src/main/resources/mapper/modules/MallGoodsMapper.xml
index d27bff4..3070af0 100644
--- a/src/main/resources/mapper/modules/MallGoodsMapper.xml
+++ b/src/main/resources/mapper/modules/MallGoodsMapper.xml
@@ -118,4 +118,12 @@
     <select id="selectMallGoodsInfoById" resultType="cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo">
         select * from mall_goods a where a.id = #{id}
     </select>
+
+    <select id="selectGoodsStockAndVolume" resultType="java.util.HashMap">
+        select
+            sum(stock) stock,
+            sum(sku_volume) volume
+        from mall_goods_sku
+        where goods_id=#{id}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1