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 5d7145f8..1006a774 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 @@ -48,7 +48,11 @@ public class ShopUserServiceImpl extends ServiceImpl i @Override public ShopUser getShopUserInfo(Long shopId, long userId) { Long mainShopId = shopInfoService.getMainIdByShopId(shopId); - ShopUser shopUser = queryChain().eq(ShopUser::getMainShopId, shopId).eq(ShopUser::getUserId, userId).one(); + ShopUser shopUser = queryChain().eq(ShopUser::getUserId, userId).and(q -> { + q.eq(ShopUser::getMainShopId, mainShopId).or(q1 -> { + q1.eq(ShopUser::getSourceShopId, shopId); + }); + }).one(); if (shopUser == null) { shopUser = new ShopUser(); UserInfo userInfo = userInfoService.getById(userId);