From 1ab55c2c461ca2d0bf06144ebcfbf631a512bfec Mon Sep 17 00:00:00 2001
From: SongZhang <2064194730@qq.com>
Date: Mon, 23 Sep 2024 11:16:33 +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=20=E6=89=AB=E7=A0=81=E5=8F=96=E5=8F=B7?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/service/impl/app/TbCallServiceImpl.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 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 99119168..64cf148a 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,7 +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)
+                    .ne(TbCallQueue::getIsPostpone, 2)
                     .eq(TbCallQueue::getCallTableId, takeNumberDTO.getCallTableId()).one();
             if (callQueue != null) {
                 throw new BadRequestException("当前用户已取号");
@@ -326,7 +326,7 @@ public class TbCallServiceImpl implements TbCallService {
             case 3:
                 callQueue.setPassTime(DateUtil.date());
                 // 已经顺延
-                callQueue.setIsPostpone(1);
+                callQueue.setIsPostpone(callQueue.getIsPostpone() == 0 ? 1 : 2);
                 TbShopInfo shopInfo = shopInfoRepository.findById(callQueue.getShopId()).orElse(null);
                 if (shopInfo == null) {
                     throw new BadRequestException("店铺信息不存在");
@@ -455,7 +455,7 @@ public class TbCallServiceImpl implements TbCallService {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 
         // 生成二维码图片，输出到字节数组输出流
-        QrCodeUtil.generate("Your QR Code Content Here", config, "png", outputStream);
+        QrCodeUtil.generate(StrUtil.format(callPageUrl, shopId, ""), config, "png", outputStream);
 
         // 将图片转换为 Base64 字符串
         String base64 = Base64.getEncoder().encodeToString(outputStream.toByteArray());