From 41bf053fad4ff790b5d9c5b05221269b15d2c294 Mon Sep 17 00:00:00 2001 From: SongZhang <2064194730@qq.com> Date: Thu, 19 Sep 2024 16:07:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8E=92=E9=98=9F=E5=8F=96=E5=8F=B7=20?= =?UTF-8?q?=E6=8E=92=E5=8F=B7=E5=88=97=E8=A1=A8=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 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) 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 01d13e0..4128c90 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 @@ -25,8 +25,10 @@ import org.springframework.context.annotation.Primary; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.atomic.AtomicReference; @Service @@ -113,7 +115,20 @@ public class TbCallServiceImpl implements TbCallService { @Override public Object getAllInfo(Integer shopId) { - return callTableService.lambdaQuery().eq(TbCallTable::getShopId, shopId).eq(TbCallTable::getState, 1).list(); + ArrayList> infoList = new ArrayList<>(); + List list = callTableService.lambdaQuery() + .eq(TbCallTable::getShopId, shopId).list(); + list.forEach(item -> { + Map map = BeanUtil.beanToMap(item, false, false); + Integer count = callQueueService.lambdaQuery() + .eq(TbCallQueue::getCallTableId, item.getId()) + .eq(TbCallQueue::getShopId, shopId) + .in(TbCallQueue::getState, 0, 1).count(); + map.put("waitingCount", count); + map.put("waitTime", count * item.getWaitTime()); + infoList.add(map); + }); + return infoList; } @Override