diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java index 58b5428..1b33987 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/dao/TbProductSkuMapper.java @@ -51,7 +51,7 @@ public interface TbProductSkuMapper { @Update("update tb_product_sku set stock_number=stock_number-#{num} WHERE id=#{id} ") int decrStockUnCheck(String id, int num); - @Select("select * from tb_product_sku where is_grounding=1 and product_id=#{id}") + @Select("select * from tb_product_sku where is_grounding=1 and product_id=#{id} and is_del=0") List selectByProductCheckGrounding(@Param("id") Integer id); @Select("select * from tb_product_sku where is_grounding=1 and is_del=0 and product_id=#{id}") @@ -62,4 +62,7 @@ public interface TbProductSkuMapper { @Update("update tb_product_sku set stock_number=#{stock} where product_id=#{skuId} and shop_id=#{shopId}") int updateStock(@Param("shopId") Integer shopId, @Param("skuId") Integer skuId, @Param("stock") Integer stock); + + @Select("select * from tb_product_sku where product_id=#{id} and is_del=0") + List selectByProductId(Integer id); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java index 366791b..7c3d5df 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java @@ -192,7 +192,17 @@ public class ProductService { // 查询sku信息 List skuWithBLOBs = tbProductSkuMapper.selectByProductCheckGrounding(it.getId()); + List skus = tbProductSkuMapper.selectByProductId(it.getId()); + if (it.getIsDistribute() == 0) { + int num = 0; + for (TbProductSku item : skus) { + num += item.getStockNumber(); + } + it.setStockNumber(num); + } it.setSkuList(skuWithBLOBs); + + }); } PageInfo pageInfo=new PageInfo(tbProductWithBLOBs);