From 0a14ecdf166f3b1fd2434d568a13c5c2d6199080 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Tue, 24 Sep 2024 16:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AB=E5=8F=B7=E5=88=97=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E9=A1=BA=E5=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ysk/cashier/service/impl/app/TbCallServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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 7a325b2a..22c1194b 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 @@ -263,7 +263,7 @@ 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); - boolean flag = callQueueService.updateById(callQueue); + callQueueService.updateById(callQueue); TbCallConfig config = getConfig(callQueueDTO.getShopId()); // 临近用户提醒 @@ -346,8 +346,8 @@ public class TbCallServiceImpl implements TbCallService { Byte isPostpone = callTable.getIsPostpone(); Integer postponeNum = callTable.getPostponeNum(); - // 判断是否需要顺延 - if (callQueue.getIsPostpone() == 0 && isPostpone != null && isPostpone == 1 && postponeNum != null && postponeNum > 0) { + // 判断是否需要顺延, 暂时注释 + if (false && callQueue.getIsPostpone() == 0 && isPostpone != null && isPostpone == 1 && postponeNum != null && postponeNum > 0) { // 查询当前桌以及顺延桌数 List current = callQueueService.lambdaQuery() .eq(TbCallQueue::getCallTableId, callQueue.getCallTableId()) @@ -435,7 +435,7 @@ public class TbCallServiceImpl implements TbCallService { LambdaQueryChainWrapper q = callQueueService.lambdaQuery() .eq(TbCallQueue::getCallTableId, item.getId()) .eq(TbCallQueue::getShopId, shopId) - .ne(TbCallQueue::getIsPostpone, 2) + .notIn(TbCallQueue::getIsPostpone, 1, 2) .eq(TbCallQueue::getCreateDay, DateUtil.today()) .in(TbCallQueue::getState, 0, 1, 3); Long count = q.count(); @@ -563,4 +563,5 @@ public class TbCallServiceImpl implements TbCallService { tbCallConfig.setUpdateTime(DateUtil.date().toInstant()); return tbCallConfigService.updateById(tbCallConfig); } + }