From c92fbfc5544b499c1f8f209280f3f51606f20534 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Mon, 20 May 2024 18:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/service/PayService.java          | 2 +-
 src/main/resources/mapper/TbCashierCartMapper.xml          | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
index 3aacb09..1fb2a11 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
@@ -146,7 +146,7 @@ public class PayService {
         }
 
 
-        List<TbCashierCart> cashierCarts=  tbCashierCartMapper.selectByOrderId(orderId,"closed");
+        List<TbCashierCart> cashierCarts=  tbCashierCartMapper.selectByOrderId(orderId,null);
         if(ObjectUtil.isEmpty(cashierCarts)||ObjectUtil.isNull(cashierCarts)){
             return Result.fail("购物车信息不存在");
         }
diff --git a/src/main/resources/mapper/TbCashierCartMapper.xml b/src/main/resources/mapper/TbCashierCartMapper.xml
index 0f141c1..202975b 100644
--- a/src/main/resources/mapper/TbCashierCartMapper.xml
+++ b/src/main/resources/mapper/TbCashierCartMapper.xml
@@ -372,6 +372,11 @@
     </update>
 
     <select id="selectByOrderId" resultMap="BaseResultMap">
-        select * from tb_cashier_cart where order_id=#{orderId} and `status`=#{status}
+        select * from tb_cashier_cart where order_id=#{orderId}
+        <if test="status != null">
+            and `status`=#{status}
+        </if>
+
+
     </select>
 </mapper>
\ No newline at end of file