From 871b0c52624128ba165ae62d97c3f3cbe8002952 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Mon, 23 Sep 2024 10:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=E9=A1=BA?= =?UTF-8?q?=E5=BB=B6=E4=B9=8B=E5=90=8E=E6=94=AF=E6=8C=81=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E5=8F=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/mybatis/entity/TbCallQueue.java | 5 ++++- .../cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbCallQueue.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbCallQueue.java index 6a42b7f7..0dd03642 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbCallQueue.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbCallQueue.java @@ -59,7 +59,7 @@ public class TbCallQueue { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Column(name = "cancel_time") private Date cancelTime; - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @Column(name = "confirm_time") private Date confirmTime; @@ -84,4 +84,7 @@ public class TbCallQueue { @Column(name = "create_day") private String createDay; + @Column(name = "is_postpone") + private Integer isPostpone; + } 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 12608e30..99119168 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 @@ -163,6 +163,7 @@ public class TbCallServiceImpl implements TbCallService { .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId()) .in(TbCallQueue::getState, 0, 1) .eq(TbCallQueue::getCreateDay, DateUtil.today()) + .eq(TbCallQueue::getIsPostpone, 0) .eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one(); if (callQueue != null) { throw new BadRequestException("当前用户已取号"); @@ -182,6 +183,7 @@ public class TbCallServiceImpl implements TbCallService { .eq(TbCallQueue::getPhone, takeNumberDTO.getPhone()) .eq(TbCallQueue::getShopId, takeNumberDTO.getShopId()) .eq(TbCallQueue::getCreateDay, DateUtil.today()) + .eq(TbCallQueue::getIsPostpone, 0) .eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one(); if (callQueue != null) { throw new BadRequestException("当前用户已取号"); @@ -323,6 +325,8 @@ public class TbCallServiceImpl implements TbCallService { break; case 3: callQueue.setPassTime(DateUtil.date()); + // 已经顺延 + callQueue.setIsPostpone(1); TbShopInfo shopInfo = shopInfoRepository.findById(callQueue.getShopId()).orElse(null); if (shopInfo == null) { throw new BadRequestException("店铺信息不存在"); @@ -337,7 +341,7 @@ public class TbCallServiceImpl implements TbCallService { Integer postponeNum = callTable.getPostponeNum(); // 判断是否需要顺延 - if (isPostpone != null && isPostpone == 1 && postponeNum != null && postponeNum > 0) { + if (callQueue.getIsPostpone() == 0 && isPostpone != null && isPostpone == 1 && postponeNum != null && postponeNum > 0) { // 查询当前桌以及顺延桌数 List current = callQueueService.lambdaQuery() .eq(TbCallQueue::getCallTableId, callQueue.getCallTableId())