From 3465c86830d4cd1cbd89a56159dfe9a77c2c19a5 Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Tue, 24 Sep 2024 11:50:58 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2sql=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/cashierservice/service/impl/TbCallServiceImpl.java | 2 +-
src/main/resources/mapper/TbCallQueueMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
index 735aa31..8a9c422 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
@@ -164,7 +164,7 @@ public class TbCallServiceImpl implements TbCallService {
throw new MsgException("您未排号请先排号");
}
- if (queue.getOpenId().equals(subMsgDTO.getOpenId()) && queue.getSubState() == 1) {
+ if (queue.getOpenId() != null && queue.getOpenId().equals(subMsgDTO.getOpenId()) && queue.getSubState() == 1) {
return true;
}
diff --git a/src/main/resources/mapper/TbCallQueueMapper.xml b/src/main/resources/mapper/TbCallQueueMapper.xml
index b502da6..12c6a3c 100644
--- a/src/main/resources/mapper/TbCallQueueMapper.xml
+++ b/src/main/resources/mapper/TbCallQueueMapper.xml
@@ -72,7 +72,7 @@
a.shop_id = #{shopId}
AND a.create_day = #{today} -- 替换为目标日期
- and a.open_id = #{openId} or a.open_id is null -- 替换为目标用户的 open_id
+ and (a.open_id = #{openId} or a.open_id is null) -- 替换为目标用户的 open_id
and a.id = #{queueId} -- 替换为目标用户的 open_id