From dde33361eb11ce72be0e6540bd75fc568dd72e67 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 26 Sep 2024 09:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E6=9C=80=E5=85=88=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=8F=AB=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/app/TbCallServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java index 22c1194b..7e413c2e 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java @@ -226,16 +226,17 @@ public class TbCallServiceImpl implements TbCallService { throw new BadRequestException("叫号用户不存在"); } + callQueue.setState((byte) 1); + callQueue.setCallCount(callQueue.getCallCount() + 1); + callQueue.setCallTime(DateUtil.date()); + callQueueService.updateById(callQueue); + if (callQueue.getSubState().equals(0)) { return new HashMap(){{ put("state", "-1"); }}; } - callQueue.setState((byte) 1); - callQueue.setCallCount(callQueue.getCallCount() + 1); - callQueue.setCallTime(DateUtil.date()); - // 发送模板消息通知用户 TbShopInfo shopInfo = shopInfoRepository.findById(callQueue.getShopId()).orElse(null); @@ -263,7 +264,6 @@ public class TbCallServiceImpl implements TbCallService { wxMiniUtils.sendCurrentOrNearCallMsg(shopInfo.getShopName(), getStrByState(Integer.valueOf(callQueue.getState())), callQueue.getCallNum(), current.isEmpty() ? "" : current.get(0).getCallNum(), "排号信息", callQueue.getOpenId(), false); - callQueueService.updateById(callQueue); TbCallConfig config = getConfig(callQueueDTO.getShopId()); // 临近用户提醒