Merge branch 'ww' into test

src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopInfoController.java

@@ -17,6 +17,11 @@ public class ShopInfoController {
     @Autowired
     ShopInfoService shopInfoService;
 
+    @GetMapping("/queryShopInfo")
+    public Result queryShopInfo(@RequestParam Integer shopId){
+        return shopInfoService.queryShopInfo(shopId);
+    }
+
     @GetMapping("queryShopArea")
     public Result queryShopArea(@RequestHeader("token") String token,
                                 @RequestHeader("loginName") String loginName,

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java

@@ -105,9 +105,16 @@ public class TbShopInfo implements Serializable {
 
     private String isMemberReturn;
 
-
+    //是否开启桌位费 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;
@@ -495,4 +502,44 @@ public class TbShopInfo implements Serializable {
     public void setIsMemberReturn(String isMemberReturn) {
         this.isMemberReturn = isMemberReturn;
     }
+
+    public Integer getIsTableFee() {
+        return isTableFee;
+    }
+
+    public void setIsTableFee(Integer isTableFee) {
+        this.isTableFee = isTableFee;
+    }
+
+    public BigDecimal getTableFee() {
+        return tableFee;
+    }
+
+    public void setTableFee(BigDecimal tableFee) {
+        this.tableFee = tableFee;
+    }
+
+    public String getEatModel() {
+        return eatModel;
+    }
+
+    public void setEatModel(String eatModel) {
+        this.eatModel = eatModel;
+    }
+
+    public String getSmallQrcode() {
+        return smallQrcode;
+    }
+
+    public void setSmallQrcode(String smallQrcode) {
+        this.smallQrcode = smallQrcode;
+    }
+
+    public String getPaymentQrcode() {
+        return paymentQrcode;
+    }
+
+    public void setPaymentQrcode(String paymentQrcode) {
+        this.paymentQrcode = paymentQrcode;
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java

@@ -53,6 +53,10 @@ public class ShopInfoService {
         this.orderInfoMapper = orderInfoMapper;
     }
 
+    public Result queryShopInfo(Integer shopId) {
+        return new Result(CodeEnum.SUCCESS,tbShopInfoMapper.selectByPrimaryKey(shopId));
+    }
+
     public Result queryShopArea(String shopId){
         List<TbShopArea> list= tbShopAreaMapper.selectByShopId(shopId);
         return Result.success(CodeEnum.SUCCESS,list);

src/main/resources/mapper/TbShopInfoMapper.xml

@@ -51,6 +51,11 @@
     <result column="is_member_in" jdbcType="VARCHAR" property="isMemberIn" />
     <result column="is_member_return" jdbcType="VARCHAR" property="isMemberReturn" />
 
+    <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">
     <result column="view" jdbcType="LONGVARCHAR" property="view" />
@@ -61,7 +66,8 @@
     detail, lat, lng, mch_id, register_type, is_wx_ma_independent, address, city, type, 
     industry, industry_name, 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,is_custom,is_return,is_member_in,is_member_return
+    distribute_level, created_at, updated_at, proxy_id,is_custom,is_return,is_member_in,is_member_return,
+              is_table_fee,table_fee,eat_model,small_qrcode,payment_qrcode
   </sql>
   <sql id="Blob_Column_List">
     view