diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java
index 2c504b6f..5202f584 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/StockMapper.java
@@ -56,4 +56,6 @@ public interface StockMapper extends BaseMapper
{
void batchDeleteStockByProductIds(@Param("productIdList") List productIdList);
void batchReduceStockByLog(@Param("stockLogList") List stockLogList);
+
+ List getDefaultStockCount(@Param("productIdList") List productIdList);
}
\ No newline at end of file
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductPageVO.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductPageVO.java
index 0ccac3fe..5c1bcc2c 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductPageVO.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/pojo/vo/ProductPageVO.java
@@ -106,4 +106,7 @@ public class ProductPageVO {
@ApiModelProperty(value = "商品子图")
private List productPictures;
+
+ @ApiModelProperty(value = "商品均色均码总库存")
+ private Integer defaultStockCount;
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/StockService.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/StockService.java
index 9d35c941..2282ef2e 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/StockService.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/service/mybatis/StockService.java
@@ -87,4 +87,13 @@ public interface StockService extends IService {
* @param stockLogList
*/
void batchReduceStockByLog(List stockLogList);
+
+ /**
+ * 获取某些商品均色均码的库存数
+ * @author 王富康
+ * @date 2024/8/4
+ * @param productIdList
+ * @return List
+ */
+ List getDefaultStockCount(List productIdList);
}
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java
index 2987612c..72e71e9d 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/ProductServiceImpl.java
@@ -7,6 +7,7 @@ import cc.hiver.core.entity.User;
import cc.hiver.mall.common.constant.PurchaseConstant;
import cc.hiver.mall.dao.mapper.ProductMapper;
import cc.hiver.mall.entity.Product;
+import cc.hiver.mall.entity.Stock;
import cc.hiver.mall.pojo.dto.SaleDetailDTO;
import cc.hiver.mall.pojo.dto.SaleDetailQueryDTO;
import cc.hiver.mall.pojo.dto.SaleQueryDTO;
@@ -16,6 +17,7 @@ import cc.hiver.mall.productpicture.entity.ProductPicture;
import cc.hiver.mall.productpicture.service.ProductPictureService;
import cc.hiver.mall.service.mybatis.ProductCategoryService;
import cc.hiver.mall.service.mybatis.ProductService;
+import cc.hiver.mall.service.mybatis.StockService;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -44,6 +46,9 @@ public class ProductServiceImpl extends ServiceImpl impl
@Autowired
private ProductCategoryService productCategoryService;
+ @Autowired
+ private StockService stockService;
+
@Override
public IPage getShareList(ProductPageQuery productPageQuery) {
final Page page = new Page<>(productPageQuery.getPageNum(), productPageQuery.getPageSize());
@@ -72,6 +77,21 @@ public class ProductServiceImpl extends ServiceImpl impl
productPageVO.setProductPictures(productPictureMap.get(productId));
}
}
+ // 获取商品均色均码的库存数
+ List stockList = stockService.getDefaultStockCount(productIdList);
+ // 处理为map, key为productId
+ final Map stockMap = new HashMap<>();
+ for (Stock stock : stockList) {
+ stockMap.put(stock.getProductId(), stock);
+ }
+ for (ProductPageVO productPageVO : list) {
+ final String productId = productPageVO.getId();
+ if (stockMap.containsKey(productId)) {
+ productPageVO.setDefaultStockCount(stockMap.get(productId).getStockCount());
+ }else{
+ productPageVO.setDefaultStockCount(0);
+ }
+ }
}
page.setRecords(list);
return page;
diff --git a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java
index 0dd583f7..860c67a0 100644
--- a/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java
+++ b/hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/StockServiceImpl.java
@@ -1181,4 +1181,9 @@ public class StockServiceImpl extends ServiceImpl implements
public void batchReduceStockByLog(List stockLogList) {
stockMapper.batchReduceStockByLog(stockLogList);
}
+
+ @Override
+ public List getDefaultStockCount(List productIdList) {
+ return stockMapper.getDefaultStockCount(productIdList);
+ }
}
diff --git a/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml b/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml
index 37e1b968..7cf654ee 100644
--- a/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml
+++ b/hiver-modules/hiver-mall/src/main/resources/mapper/StockMapper.xml
@@ -686,4 +686,17 @@
update t_stock set stock_count = stock_count - #{item.productCount} WHERE product_id = #{item.productId} and attribute_list = #{item.attributeList}
+
+
\ No newline at end of file