From 9d380d435f628f7d7a1970fda466d04ec8c2d292 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Fri, 27 Sep 2024 14:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/CartService.java   | 11 ++++-
 .../service/ProductService.java               | 40 +++++++++----------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
index b95ce4e..c850f13 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
@@ -1124,7 +1124,16 @@ public class CartService {
 //                    }
 //                }
 //            }
-            cashierCartMapper.updateStatusByOrderIdForMini(jsonObject.getString("tableId"), "closed");
+            if (StrUtil.isNotBlank(tableId)) {
+                cashierCartMapper.updateStatusByOrderIdForMini(jsonObject.getString("tableId"), "closed");
+            }else {
+                mpCashierCartMapper.update(null, new LambdaUpdateWrapper<TbCashierCart>()
+                        .eq(TbCashierCart::getShopId, shopId)
+                        .and(q -> q.isNull(TbCashierCart::getTableId).or().eq(TbCashierCart::getTableId, ""))
+                        .eq(TbCashierCart::getUserId, userId)
+                        .gt(TbCashierCart::getCreatedAt, DateUtil.offsetDay(DateUtil.date(), -1).getTime())
+                        .set(TbCashierCart::getStatus, "closed"));
+            }
 //            cashierCartMapper.updateStatusByTableId(jsonObject.getString("tableId"), "closed");
             String tableCartKey = RedisCst.getTableCartKey(shopId, tableId, userId);
             redisUtil.saveMessage(tableCartKey, new JSONArray().toJSONString());
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 b917ce7..9df4c59 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -490,7 +490,7 @@ public class ProductService {
 
     public void checkPauseSale(TbProduct tbProduct, List<TbProductSku> skus, boolean isSingle) {
         if (tbProduct.getIsStock() == 1) {//库存开关 1开启
-            if (Integer.valueOf(tbProduct.getIsDistribute()).equals(1)) {//共享库存 1开启
+//            if (Integer.valueOf(tbProduct.getIsDistribute()).equals(1)) {//共享库存 1开启
                 if (tbProduct.getStockNumber() != null && tbProduct.getStockNumber() <= 0) {
                     tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
                     return;
@@ -499,25 +499,25 @@ public class ProductService {
                 if (isSingle && tbProduct.getIsPauseSale() == 1) {
                     return;
                 }
-            } else {
-                if (isSingle && !skus.stream().filter(res -> res.getIsPauseSale().equals(1)).collect(Collectors.toList()).isEmpty()) {
-                    tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
-                    return;
-                }
-
-                if (!tbProduct.getTypeEnum().equals("sku")) {
-                    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;
-                    }
-                }
-            }
+//            } else {
+//                if (isSingle && !skus.stream().filter(res -> res.getIsPauseSale().equals(1)).collect(Collectors.toList()).isEmpty()) {
+//                    tbProduct.setIsPauseSale(Byte.parseByte("1"));//售罄 1暂停
+//                    return;
+//                }
+//
+//                if (!tbProduct.getTypeEnum().equals("sku")) {
+//                    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();