From d264f79c9e1f3fbdc03a13bf7b8b768cbea034dd Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 21 Aug 2024 14:49:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=20=E8=80=97=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProductService.java               | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

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 83bd637..97c6826 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -408,39 +408,43 @@ public class ProductService {
             if (Integer.valueOf(tbProduct.getIsDistribute()).equals(1)) {//共享库存 1开启
                 if (tbProduct.getStockNumber() != null && tbProduct.getStockNumber() <= 0) {
                     tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
+                    return;
                 }
             } else {
                 if (!tbProduct.getTypeEnum().equals("sku")) {
-                    if (skus.stream().anyMatch(sku -> sku.getStockNumber() != null && sku.getStockNumber() <= 0))
+                    if (skus.stream().anyMatch(sku -> sku.getStockNumber() != null && sku.getStockNumber() <= 0)){
                         tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
+                        return;
+                    }
                 } else {
                     skus.removeIf(sku -> sku.getStockNumber() != null && sku.getStockNumber() <= 0);
                     if (CollectionUtils.isEmpty(skus)) {
                         tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
                         return;
                     }
-                    Iterator<TbProductSku> iterator = skus.iterator();
-                    while (iterator.hasNext()) {
-                        TbProductSku tbProductSku = iterator.next();
-                        List<TbProskuCon> proskuConList = tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(Integer.valueOf(tbProductSku.getId()), Integer.valueOf(tbProductSku.getShopId()), Integer.valueOf(tbProductSku.getProductId()));
-                        if (Objects.nonNull(proskuConList) && proskuConList.size() > 0) {
-                            for (TbProskuCon proskuCon : proskuConList) {
-                                if ("1".equals(proskuCon.getStatus())) {
-                                    TbConsInfo consInfo = tbConsInfoMapper.selectByPrimaryKey(proskuCon.getConInfoId());
-                                    if ("1".equals(consInfo.getIsCheck())) {
-                                        if (N.gt(proskuCon.getSurplusStock(), consInfo.getStockNumber().abs().subtract(consInfo.getStockConsume().abs()))) {
-                                            iterator.remove();
-                                        }
-                                    }
+                }
+            }
+            Iterator<TbProductSku> iterator = skus.iterator();
+            while (iterator.hasNext()) {
+                TbProductSku tbProductSku = iterator.next();
+                List<TbProskuCon> proskuConList = tbProskuConMapper.selectByShopIdAndSkuIdAndProductId(Integer.valueOf(tbProductSku.getId()), Integer.valueOf(tbProductSku.getShopId()), Integer.valueOf(tbProductSku.getProductId()));
+                if (Objects.nonNull(proskuConList) && proskuConList.size() > 0) {
+                    for (TbProskuCon proskuCon : proskuConList) {
+                        if ("1".equals(proskuCon.getStatus())) {
+                            TbConsInfo consInfo = tbConsInfoMapper.selectByPrimaryKey(proskuCon.getConInfoId());
+                            if ("1".equals(consInfo.getIsCheck())) {
+                                if (N.gt(proskuCon.getSurplusStock(), consInfo.getStockNumber().abs().subtract(consInfo.getStockConsume().abs()))) {
+                                    iterator.remove();
+                                    break;
                                 }
                             }
                         }
                     }
-                    if (CollectionUtils.isEmpty(skus)) {
-                        tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
-                    }
                 }
             }
+            if (CollectionUtils.isEmpty(skus)) {
+                tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
+            }
         }
     }