From 8b657fdc8a6df3deb1a363f9aea07d511cd311ae Mon Sep 17 00:00:00 2001
From: yijiegong <sankejuzi@163.com>
Date: Thu, 22 Aug 2024 10:57:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=B0=E6=A1=8C=E6=90=BA?=
 =?UTF-8?q?=E5=B8=A6=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/TbShopTableVO.java          | 2 ++
 src/main/resources/mapper/TbShopTableMapper.xml                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java
index bea32fc..5fc01f2 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbShopTableVO.java
@@ -9,4 +9,6 @@ import lombok.EqualsAndHashCode;
 public class TbShopTableVO extends TbShopTable {
     private Integer userId;
     private String masterId;
+    private Integer orderId;
+    private String orderNo;
 }
diff --git a/src/main/resources/mapper/TbShopTableMapper.xml b/src/main/resources/mapper/TbShopTableMapper.xml
index 10bdba7..05a877f 100644
--- a/src/main/resources/mapper/TbShopTableMapper.xml
+++ b/src/main/resources/mapper/TbShopTableMapper.xml
@@ -229,7 +229,7 @@
 
     </select>
   <select id="selectTableInfo" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbShopTableVO">
-    select a.*, b.user_id, c.master_id from tb_shop_table a
+    select a.*, b.user_id, c.master_id, c.id as orderId, c.order_no as orderNo from tb_shop_table a
     left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid' or b.`status`='paying') and b.user_id is not null
     left join tb_order_info c on a.qrcode=c.table_id and (c.`status`='unpaid' or c.`status`='paying') and c.master_id is not null
     where a.shop_id=#{shopId}