From f9ac4b3e2249d12c6dadc05ccf37c88f0b491e05 Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Sat, 28 Mar 2026 14:25:23 +0800
Subject: [PATCH] config info

---
 .../java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java   | 4 ++++
 .../src/main/java/com/czg/account/entity/ShopInfo.java       | 5 +++++
 .../src/main/java/com/czg/account/entity/ShopTable.java      | 5 +++++
 .../src/main/resources/mapper/ShopTableMapper.xml            | 3 ++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
index fba11c8c2..21559890e 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
@@ -54,6 +54,10 @@ public class ShopInfoEditDTO {
      * 是否开启会员余额支付
      */
     private Integer isAccountPay;
+    /**
+     * 是否允许用户支付
+     */
+    private Integer isUserPay;
     /**
      * 是否启用满减活动 1-是 0-否
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
index 688e95200..4205c48e2 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
@@ -312,6 +312,11 @@ public class ShopInfo implements Serializable {
      */
     @Column(ignore = true)
     private Integer isAccountPay;
+    /**
+     * 是否允许用户支付
+     */
+    @Column(ignore = true)
+    private Integer isUserPay;
     /**
      * 主店名称
      */
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
index c91126bed..c98d7ade0 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTable.java
@@ -57,6 +57,11 @@ public class ShopTable implements Serializable {
      */
     private Integer areaId;
 
+    /**
+     * 区域名称
+     */
+    private String areaName;
+
     /**
      * 是否接受网络预定
      */
diff --git a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
index 275020fc5..9bbb2e4e3 100644
--- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
@@ -5,11 +5,12 @@
 <mapper namespace="com.czg.service.account.mapper.ShopTableMapper">
 
     <select id="pageInfo" resultType="com.czg.account.vo.ShopTableVO">
-        select a.*, b.id orderId, b.user_id, b.origin_amount as orderAmount, b.seat_num as personNum, b.create_time as orderCreateTime
+        select a.*, b.id orderId, b.user_id, b.origin_amount as orderAmount, b.seat_num as personNum, b.create_time as orderCreateTime, ar.name as areaName
         from tb_shop_table as a
         left join tb_order_info as b
         on a.table_code = b.table_code and b.`status` = 'unpaid' and b.table_code != '' and
         b.table_code is not null
+        left join tb_shop_table_area as ar on a.area_id = ar.id
         where a.shop_id=#{shopId}
         <if test="areaId != null">
             and a.area_id=#{areaId}