From 17c0716a51cc60f83560fceaadc121b5e8698150 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 18 Nov 2025 16:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java | 5 +++++ .../src/main/java/com/czg/account/entity/ShopConfig.java | 5 +++++ .../src/main/java/com/czg/account/entity/ShopInfo.java | 5 +++++ .../account/service/impl/FreeDineConfigServiceImpl.java | 3 ++- 4 files changed, 17 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 be0a3a8e7..f43a73f13 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 @@ -266,4 +266,9 @@ public class ShopInfoEditDTO { */ private Integer tableClearTime; + /** + * 点餐电子围栏开关 + */ + private Integer isOrderFence; + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java index a0f5f49c0..697bffaea 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java @@ -106,4 +106,9 @@ public class ShopConfig implements Serializable { * '自动清台 支付几分钟后 默认10分钟后' */ private Integer tableClearTime; + /** + * 点餐电子围栏开关 + */ + private Integer isOrderFence; + } 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 729b4a0ac..e886df92d 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 @@ -334,6 +334,11 @@ public class ShopInfo implements Serializable { */ @Column(ignore = true) private Integer tableClearTime; + /** + * 点餐电子围栏开关 + */ + @Column(ignore = true) + private Integer isOrderFence; /** * 运营端余额 diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java index 20a47a604..0fd4e16f1 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java @@ -61,7 +61,8 @@ public class FreeDineConfigServiceImpl extends ServiceImpl() : freeDineConfigEditDTO.getShopIdList()); + shopConfigService.editStatusByShopIdList(config.getShopId(), freeDineConfigEditDTO.getEnable() ? 1 : 0,true, "is_account_ay", + freeDineConfigEditDTO.getUseShopType(), freeDineConfigEditDTO.getShopIdList() == null ? new ArrayList<>() : freeDineConfigEditDTO.getShopIdList()); if (freeDineConfigEditDTO.getUseType() != null) { config.setUseType(JSONObject.toJSONString(freeDineConfigEditDTO.getUseType())); }