From f16f23ab84ec3286477a5fffd3aa187ca119cd45 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Sun, 29 Sep 2024 17:52:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=20=E9=A4=90=E4=BD=8D?=
 =?UTF-8?q?=E8=B4=B9=20=E4=B8=8D=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/order/TbOrderInfoServiceImpl.java    |  6 ++---
 .../productimpl/TbProductServiceImpl.java     | 22 ++++++++++---------
 .../TbProductStockDetailServiceImpl.java      |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
index 551230a5..84da9d5b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/order/TbOrderInfoServiceImpl.java
@@ -296,10 +296,8 @@ public class TbOrderInfoServiceImpl implements TbOrderInfoService {
         //修改耗材数据
         JSONObject jsonObject1 = new JSONObject();
         jsonObject1.put("type", "delete");
-
-        Optional<TbOrderInfo> byId = tbOrderInfoRepository.findById(Integer.valueOf(orderId));
-        if (byId != null && byId.isPresent()) {
-            TbOrderInfo tbOrderInfo = byId.get();
+        TbOrderInfo tbOrderInfo = tbOrderInfoRepository.findById(Integer.valueOf(orderId)).orElse(null);
+        if (tbOrderInfo != null) {
             if (tbOrderInfo.getStatus().equals("unpaid")) {
                 upOrderStatus(tbOrderInfo);
                 jsonObject1.put("orderId", tbOrderInfo.getId());
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
index 4d444143..8c7f1406 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java
@@ -761,16 +761,18 @@ public class TbProductServiceImpl implements TbProductService {
 
     @Override
     public void returnStockByPro(Integer productId, Integer productSkuId, Integer num) {
-        log.info("开始返还库存，订单超时取消，商品id：{}", productId);
-        TbProduct product = tbProductRepository.findById(productId).orElse(null);
-        if (product == null) {
-            log.info("返还库存失败，商品不存在： {}", productId);
-            return;
-        }
-        if (product.getIsDistribute() == 1) {
-            tbProductRepository.incrStock(productId, num);
-        } else {
-            tbProductSkuRepository.incrStock(productSkuId, Double.valueOf(num));
+        if (productId > 0) {
+            log.info("开始返还库存，订单超时取消，商品id：{}", productId);
+            TbProduct product = tbProductRepository.findById(productId).orElse(null);
+            if (product == null) {
+                log.info("返还库存失败，商品不存在： {}", productId);
+                return;
+            }
+            if (product.getIsDistribute() == 1) {
+                tbProductRepository.incrStock(productId, num);
+            } else {
+                tbProductSkuRepository.incrStock(productSkuId, Double.valueOf(num));
+            }
         }
     }
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
index 91c3bf28..f8ebcac2 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductStockDetailServiceImpl.java
@@ -258,7 +258,7 @@ public class TbProductStockDetailServiceImpl implements TbProductStockDetailServ
         log.info("查询到订单id: {}的所有库存数据: {}", orderId, stockCountDTOS);
         stockCountDTOS.forEach(s -> {
             //客座费不统计
-            if (!s.getProId().toString().equals("-999")) {
+            if (s.getProId() > 0) {
                 if (s.getStockCount() > 0) {
                     TbProductStockDetail productStockDetail = new TbProductStockDetail();
                     productStockDetail.setCreatedAt(System.currentTimeMillis());