czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

店铺信息返回霸王餐信息

Browse Source
This commit is contained in:
张松
2025-03-13 09:43:31 +08:00
parent f99c0b902a
commit 5da87d7d8a
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDetailDTO.java
View File

@@ -1,5 +1,6 @@
package com.czg.account.dto.shopuser; package com.czg.account.dto.shopuser;
import com.czg.account.entity.FreeDineConfig;
import com.czg.account.entity.ShopExtend; import com.czg.account.entity.ShopExtend;
import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUser;
@@ -46,4 +47,9 @@ public class ShopUserDetailDTO extends ShopUser {
*/ */
private List<ShopExtend> shopExtendList = new ArrayList<>(); private List<ShopExtend> shopExtendList = new ArrayList<>();
/**
* 霸王餐信息
*/
private FreeDineConfig freeDineConfig;
} }

3
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
View File

@@ -55,6 +55,8 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
private ShopInfoMapper shopInfoMapper; private ShopInfoMapper shopInfoMapper;
@Resource @Resource
private ShopExtendService shopExtendService; private ShopExtendService shopExtendService;
@Resource
private FreeDineConfigService freeDineConfigService;
private ShopUser getUserInfo(Long shopId, Long shopUserId) { private ShopUser getUserInfo(Long shopId, Long shopUserId) {
ShopUser shopUser = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getId, shopUserId).one(); ShopUser shopUser = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getId, shopUserId).one();
@@ -301,6 +303,7 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
shopUserDetailDTO.setShopExtendList(shopExtends); shopUserDetailDTO.setShopExtendList(shopExtends);
} }
shopUserDetailDTO.setFreeDineConfig(freeDineConfigService.getConfig(shopId));
shopUserDetailDTO.setPayPwd(userInfo.getPayPwd()); shopUserDetailDTO.setPayPwd(userInfo.getPayPwd());
return shopUserDetailDTO; return shopUserDetailDTO;
} }