diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java index e51b695e5..39156696b 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java @@ -153,13 +153,7 @@ public class UShopUserServiceImpl implements UShopUserService { Long mainId = shopInfoService.getMainIdByShopId(shopId); // 当前用户信息 UserInfo userInfo = userInfoService.getById(userId); - ShopUser shopUser = shopUserService.getOne(new QueryWrapper().eq(ShopUser::getSourceShopId, shopId).eq(ShopUser::getUserId, userInfo.getId())); - if (shopUser == null) { - shopUser = new ShopUser(); - shopUser.setUserId(userId); - shopUser.setSourceShopId(shopId); - shopUser.setMainShopId(mainId); - } + ShopUser shopUser = shopUserService.getShopUserInfo(shopId, userId); // 查询系统添加的会员 UserInfo oriInfo = userInfoService.getOne(new QueryWrapper().eq(UserInfo::getPhone, shopUserAddDTO.getPhone())); diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java index 075967bde..c1e250b12 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MemberOrderServiceImpl.java @@ -75,19 +75,16 @@ public class MemberOrderServiceImpl extends ServiceImpl