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("此号码已被其他用户订阅"); }