From 92fc8debbeb2ca08c8f789f1510fa0fbdf34b625 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 24 Sep 2024 09:51:50 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?= =?UTF-8?q?=E5=90=8C=E4=B8=80=E7=94=A8=E6=88=B7=E8=AE=A2=E9=98=85=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E5=8F=B7=E7=A0=81=E4=B8=8D=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierservice/service/impl/TbCallServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 d49a968..92f0aef 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 @@ -144,7 +144,6 @@ public class TbCallServiceImpl implements TbCallService { @Override public Object getState(String openId, Integer shopId, Integer queueId) { - // 先根据openId查询，查询不到根据queueId List callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), queueId); if (callQueueInfoVOS.isEmpty()) { callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today(), null); @@ -165,6 +164,10 @@ public class TbCallServiceImpl implements TbCallService { throw new MsgException("您未排号请先排号"); } + if (queue.getOpenId().equals(subMsgDTO.getOpenId()) && queue.getSubState() == 1) { + return true; + } + if (StrUtil.isNotBlank(queue.getOpenId()) && queue.getSubState() == 1) { throw new MsgException("此号码已被其他用户订阅"); }