From 50f7ce47991081a10defb388efb56a6e33fd96b2 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Fri, 18 Oct 2024 15:41:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E9=98=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TbCallServiceImpl.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 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 951feba..a08f5e5 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 @@ -190,16 +190,18 @@ public class TbCallServiceImpl implements TbCallService { throw new MsgException("此号码已被其他用户订阅"); } - Integer count = callQueueService.lambdaQuery() + if (!subMsgDTO.getOpenId().equals(queue.getOpenId()) && queue.getSubState() == 0) { + Integer count = callQueueService.lambdaQuery() // .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) - .eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId()) - .eq(TbCallQueue::getShopId, subMsgDTO.getShopId()) - .eq(TbCallQueue::getCreateDay, DateUtil.date().toString("yyyy-MM-dd")) - .in(TbCallQueue::getState, 0, 1) - .ne(TbCallQueue::getIsPostpone, 2) - .eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count(); - if (count > 0) { - throw new MsgException("您已订阅其他号码，请勿重复订阅"); + .eq(TbCallQueue::getOpenId, subMsgDTO.getOpenId()) + .eq(TbCallQueue::getShopId, subMsgDTO.getShopId()) + .eq(TbCallQueue::getCreateDay, DateUtil.date().toString("yyyy-MM-dd")) + .in(TbCallQueue::getState, 0, 1) + .ne(TbCallQueue::getIsPostpone, 2) + .eq(TbCallQueue::getCallTableId, queue.getCallTableId()).count(); + if (count > 0) { + throw new MsgException("您已订阅其他号码，请勿重复订阅"); + } } queue.setSubState(1);