From 5da87d7d8a6fdbd1d8e9e777a4d60da29b8423bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 13 Mar 2025 09:43:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=9C=B8=E7=8E=8B=E9=A4=90=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/account/dto/shopuser/ShopUserDetailDTO.java | 6 ++++++ .../service/account/service/impl/ShopUserServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java index 1d3c86c22..182488f2e 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java @@ -1,5 +1,6 @@ package com.czg.account.dto.shopuser; +import com.czg.account.entity.FreeDineConfig; import com.czg.account.entity.ShopExtend; import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; @@ -46,4 +47,9 @@ public class ShopUserDetailDTO extends ShopUser { */ private List shopExtendList = new ArrayList<>(); + /** + * 霸王餐信息 + */ + private FreeDineConfig freeDineConfig; + } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index c771c2f3c..3f72902f1 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -55,6 +55,8 @@ public class ShopUserServiceImpl extends ServiceImpl i private ShopInfoMapper shopInfoMapper; @Resource private ShopExtendService shopExtendService; + @Resource + private FreeDineConfigService freeDineConfigService; private ShopUser getUserInfo(Long shopId, Long shopUserId) { ShopUser shopUser = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getId, shopUserId).one(); @@ -301,6 +303,7 @@ public class ShopUserServiceImpl extends ServiceImpl i shopUserDetailDTO.setShopExtendList(shopExtends); } + shopUserDetailDTO.setFreeDineConfig(freeDineConfigService.getConfig(shopId)); shopUserDetailDTO.setPayPwd(userInfo.getPayPwd()); return shopUserDetailDTO; }