From b9cce3bdf17bb2ee459c9c0ebb2cf1dfff80b739 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 8 Oct 2024 15:20:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=82=E8=B5=B7=E8=AE=A2=E5=8D=95=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=8C=82=E8=B5=B7=E5=A4=B1=E8=B4=A5fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/shopimpl/TbShopTableServiceImpl.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
index 9dfb384c..716dca5e 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
@@ -1322,7 +1322,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
     @Override
     public Object pending(PendingDTO pendingDTO) {
 
-        if (pendingDTO.getOrderId() != null) {
+        if (pendingDTO.getOrderId() != null && pendingDTO.getIsPending()) {
             TbOrderInfo tbOrderInfo = orderInfoMapper.selectOne(new LambdaQueryWrapper<TbOrderInfo>()
                     .eq(TbOrderInfo::getId, pendingDTO.getOrderId())
                     .eq(TbOrderInfo::getStatus, "pending"));
@@ -1335,13 +1335,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 .eq(TbCashierCart::getUseType, pendingDTO.getUseType())
                 .eq(TbCashierCart::getShopId, pendingDTO.getShopId());
 
-        if (!pendingDTO.getIsPending()) {
-            if (pendingDTO.getOrderId() == null) {
-                throw new BadRequestException("取消挂起订单id不为空");
-            }
-            queryWrapper.eq(TbCashierCart::getOrderId, pendingDTO.getOrderId());
-
-        } else {
+        if (pendingDTO.getIsPending()) {
             queryWrapper
                     .eq(TbCashierCart::getStatus, "create")
                     .and(query2 -> query2.or(query3 -> query3.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
@@ -1352,8 +1346,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             if (StrUtil.isNotBlank(pendingDTO.getTableId())) {
                 queryWrapper.eq(TbCashierCart::getTableId, pendingDTO.getTableId());
             }
-
-
+        } else {
+            if (pendingDTO.getOrderId() == null) {
+                throw new BadRequestException("取消挂起订单id不为空");
+            }
+            queryWrapper.eq(TbCashierCart::getOrderId, pendingDTO.getOrderId());
         }
         List<TbCashierCart> cashierCarts = cashierCartMapper
                 .selectList(queryWrapper);
@@ -1393,7 +1390,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         TbCashierCart cashierCart = new TbCashierCart();
         cashierCart.setStatus(pendingDTO.getIsPending() ? "refund" : "create");
-        cashierCart.setPendingAt(pendingDTO.getIsPending() ? DateUtil.current() : cashierCart.getPendingAt());
+        cashierCart.setPendingAt(pendingDTO.getIsPending() ? DateUtil.current() : cashierCart.getPendingAt() == null ? DateUtil.current() : cashierCart.getPendingAt());
         cashierCartMapper.update(cashierCart, new LambdaUpdateWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getOrderId, orderId));