From f2b32671b813bf6ad5bc18eb7808f5f886b7fb47 Mon Sep 17 00:00:00 2001
From: yijiegong <sankejuzi@163.com>
Date: Thu, 22 Aug 2024 11:03:53 +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=20=20+=20?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/cashierservice/entity/vo/TbShopTableVO.java         | 3 +++
 src/main/resources/mapper/TbShopTableMapper.xml                | 2 +-
 2 files changed, 4 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 5fc01f2..1362cb6 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
@@ -4,6 +4,8 @@ import com.chaozhanggui.system.cashierservice.entity.TbShopTable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class TbShopTableVO extends TbShopTable {
@@ -11,4 +13,5 @@ public class TbShopTableVO extends TbShopTable {
     private String masterId;
     private Integer orderId;
     private String orderNo;
+    private BigDecimal orderAmount;
 }
diff --git a/src/main/resources/mapper/TbShopTableMapper.xml b/src/main/resources/mapper/TbShopTableMapper.xml
index 05a877f..9fadb95 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, c.id as orderId, c.order_no as orderNo from tb_shop_table a
+    select a.*, b.user_id, c.master_id, c.id as orderId, c.order_no as orderNo, c.amount as orderAmount 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}