diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
index 4e94053..708a336 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
@@ -112,6 +112,16 @@ public class TbShopInfo implements Serializable {
     private String districts;
 
     private String isCustom;
+    //是否开启桌位费 0否1是
+    private Integer isTableFee;
+    //桌位费
+    private BigDecimal tableFee;
+    //就餐模式  堂食 dine-in  外带 take-out
+    private String eatModel;
+    //程序码(零点八零首页)
+    private String smallQrcode;
+    //店铺收款码
+    private String paymentQrcode;
 
     private static final long serialVersionUID = 1L;
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
index 9e2c781..f96fb6c 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java
@@ -390,6 +390,11 @@ public class ProductService {
     public List<TbProduct> handleDate(List<TbProduct> products,boolean check,Integer isSale,boolean isVip){
         if (!CollectionUtils.isEmpty(products)) {
             products.parallelStream().forEach(it -> {
+                TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId()));
+                if (it.getName().equals("烤牛肉")) {
+                    System.out.println("单位："+tbShopUnit.getName());
+                }
+                it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : "");
                 if(check){
                     List<TbProductGroup> tbProductGroups = tbProductGroupMapper.selectByProductId(it.getShopId(), it.getId().toString());
                     for (TbProductGroup g : tbProductGroups) {
@@ -403,8 +408,6 @@ public class ProductService {
                 }else {
                     it.setIsSale(isSale);
                 }
-                TbShopUnit tbShopUnit = unitMapper.selectByPrimaryKey(Integer.valueOf(it.getUnitId()));
-                it.setUnitSnap(tbShopUnit != null ? tbShopUnit.getName() : "");
                 //购物车数量
                 it.setCartNumber("0");
                 List<TbProductSku> tbProductSkus = tbProductSkuMapper.selectGroundingByProId(it.getId());
diff --git a/src/main/resources/mapper/TbShopInfoMapper.xml b/src/main/resources/mapper/TbShopInfoMapper.xml
index 9844f1a..78d2a24 100644
--- a/src/main/resources/mapper/TbShopInfoMapper.xml
+++ b/src/main/resources/mapper/TbShopInfoMapper.xml
@@ -54,6 +54,11 @@
         <result column="districts" jdbcType="VARCHAR" property="districts"/>
 
         <result column="is_custom" jdbcType="VARCHAR" property="isCustom" />
+        <result column="is_table_fee" jdbcType="TINYINT" property="isTableFee" />
+        <result column="table_fee" jdbcType="DECIMAL" property="tableFee" />
+        <result column="eat_model" jdbcType="VARCHAR" property="eatModel" />
+        <result column="small_qrcode" jdbcType="VARCHAR" property="smallQrcode" />
+        <result column="payment_qrcode" jdbcType="VARCHAR" property="paymentQrcode" />
     </resultMap>
     <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs"
                type="com.chaozhanggui.system.cashierservice.entity.TbShopInfo">
@@ -66,7 +71,8 @@
     detail, lat, lng, mch_id, register_type, is_wx_ma_independent, address, city, type, 
     industry, industry_name, business_start_day,business_end_day,business_time, post_time, post_amount_line, on_sale, settle_type,
     settle_time, enter_at, expire_at, status, average, order_wait_pay_minute, support_device_number,
-    distribute_level, created_at, updated_at, proxy_id, shop_qrcode, tag,is_open_yhq,is_use_vip,provinces,cities,districts,is_custom
+    distribute_level, created_at, updated_at, proxy_id, shop_qrcode, tag,is_open_yhq,is_use_vip,provinces,cities,districts,is_custom,
+        is_table_fee,table_fee,eat_model,small_qrcode,payment_qrcode
     </sql>
     <sql id="Blob_Column_List">
         view