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 74c1210..7b1e318 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 @@ -22,6 +22,7 @@ import org.springframework.context.annotation.Primary; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -121,6 +122,10 @@ public class TbCallServiceImpl implements TbCallService { @Override public Object getState(String openId, Integer shopId) { List callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.today()); - return callQueueInfoVOS.isEmpty() ? null : callQueueInfoVOS.get(0); + TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(shopId); + HashMap data = new HashMap<>(); + data.put("shopInfo", shopInfo); + data.put("queueInfo", callQueueInfoVOS.isEmpty() ? null : callQueueInfoVOS.get(0)); + return data; } }