From 17d8dd01ca37e89baed19b5467d3869930d520ee Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Sat, 14 Sep 2024 17:28:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cashierservice/service/impl/TbCallServiceImpl.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 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 60eb167..f59f9b6 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
@@ -9,6 +9,7 @@ import com.chaozhanggui.system.cashierservice.entity.TbCallTable;
 import com.chaozhanggui.system.cashierservice.entity.TbShopInfo;
 import com.chaozhanggui.system.cashierservice.entity.dto.CancelCallQueueDTO;
 import com.chaozhanggui.system.cashierservice.entity.dto.TakeNumberDTO;
+import com.chaozhanggui.system.cashierservice.entity.vo.CallQueueInfoVO;
 import com.chaozhanggui.system.cashierservice.exception.MsgException;
 import com.chaozhanggui.system.cashierservice.mapper.TbCallQueueMapper;
 import com.chaozhanggui.system.cashierservice.redis.RedisCst;
@@ -21,6 +22,7 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
 @Service
@@ -118,10 +120,7 @@ public class TbCallServiceImpl implements TbCallService {
 
     @Override
     public Object getState(String openId, Integer shopId) {
-        return callQueueService.lambdaQuery()
-                .eq(TbCallQueue::getOpenId, openId)
-                .eq(TbCallQueue::getCreateDay, DateUtil.today())
-                .eq(TbCallQueue::getShopId, shopId)
-                .one();
+        List<CallQueueInfoVO> callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today());
+        return callQueueInfoVOS.isEmpty() ? null : callQueueInfoVOS.get(0);
     }
 }