From 724d5fc2dad30ffa9c36dff7b67a578cc85badd3 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 13 Sep 2024 10:45:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E8=BF=90=E8=90=A5=E6=A8=A1=E5=BC=8F=20restaurant=20=E9=A4=90?= =?UTF-8?q?=E9=A5=AE=E7=89=88=20=E5=85=88=E4=B8=8B=E5=8D=95=E5=90=8E?= =?UTF-8?q?=E6=94=AF=E4=BB=98=20munchies=20=20=20=E5=BF=AB=E9=A4=90?= =?UTF-8?q?=E7=89=88=EF=BC=88=E5=85=88=E6=94=AF=E4=BB=98=E5=90=8E=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=EF=BC=89=20=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E6=A1=8C=E4=BD=8D=E8=B4=B9=200=E5=90=A61=E6=98=AF=20=E6=A1=8C?= =?UTF-8?q?=E4=BD=8D=E8=B4=B9=20=E5=B0=B1=E9=A4=90=E6=A8=A1=E5=BC=8F=20=20?= =?UTF-8?q?=E5=A0=82=E9=A3=9F=20dine-in=20=20=E5=A4=96=E5=B8=A6=20take-out?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ShopInfoController.java | 5 ++ .../cashierservice/entity/TbShopInfo.java | 53 +++++++++++++++++-- .../service/ShopInfoService.java | 4 ++ .../resources/mapper/TbShopInfoMapper.xml | 8 ++- 4 files changed, 66 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopInfoController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopInfoController.java index a6fb4e1..522c1a7 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/ShopInfoController.java +++ b/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, 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 b1a62cc..9ec0ae2 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java +++ b/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; + } } \ No newline at end of file diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java index 48db52d..14e6f74 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/ShopInfoService.java +++ b/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 list= tbShopAreaMapper.selectByShopId(shopId); return Result.success(CodeEnum.SUCCESS,list); diff --git a/src/main/resources/mapper/TbShopInfoMapper.xml b/src/main/resources/mapper/TbShopInfoMapper.xml index 47ed043..e9f9f2b 100644 --- a/src/main/resources/mapper/TbShopInfoMapper.xml +++ b/src/main/resources/mapper/TbShopInfoMapper.xml @@ -51,6 +51,11 @@ + + + + + @@ -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 view