From c667d1fa096a47e6d69a3cd32cf7596ffade50e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 14 Feb 2025 16:19:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/user/UShopUserController.java | 2 +- .../czg/account/service/ShopUserService.java | 2 ++ .../service/impl/ShopUserServiceImpl.java | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java index 48b756f0..a3bdfc01 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UShopUserController.java @@ -26,6 +26,6 @@ public class UShopUserController { */ @GetMapping public CzgResult get() { - return CzgResult.success(shopUserService.queryChain().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, StpKit.USER.getLoginIdAsLong()).one()); + return CzgResult.success(shopUserService.getShopUserInfo(StpKit.USER.getShopId(), StpKit.USER.getLoginIdAsLong())); } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java index f352776c..4f379b6d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java @@ -22,4 +22,6 @@ public interface ShopUserService extends IService { Boolean updateMoney(Long shopId, ShopUserMoneyEditDTO shopUserEditDTO); ShopUserSummaryDTO getSummary(Long shopId, Integer isVip); + + ShopUser getShopUserInfo(Long shopId, long userId); } 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 ff8585d5..d4448658 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 @@ -7,8 +7,10 @@ import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; import com.czg.account.dto.shopuser.ShopUserSummaryDTO; import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUserFlow; +import com.czg.account.entity.UserInfo; import com.czg.account.service.ShopUserFlowService; import com.czg.account.service.ShopUserService; +import com.czg.account.service.UserInfoService; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.ApiNotPrintException; import com.czg.sa.StpKit; @@ -31,6 +33,8 @@ import java.math.RoundingMode; public class ShopUserServiceImpl extends ServiceImpl implements ShopUserService { @Resource private ShopUserFlowService shopUserFlowService; + @Resource + private UserInfoService userInfoService; private ShopUser getUserInfo(Long shopUserId, Long shopId) { ShopUser shopUser = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getId, shopUserId).one(); @@ -83,4 +87,19 @@ public class ShopUserServiceImpl extends ServiceImpl public ShopUserSummaryDTO getSummary(Long shopId, Integer isVip) { return mapper.selectUserSummary(shopId, isVip); } + + @Override + public ShopUser getShopUserInfo(Long shopId, long userId) { + ShopUser shopUser = queryChain().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, StpKit.USER.getLoginIdAsLong()).one(); + if (shopUser == null) { + shopUser = new ShopUser(); + UserInfo userInfo = userInfoService.getById(userId); + BeanUtil.copyProperties(userInfo, shopUser); + shopUser.setShopId(shopId); + shopUser.setUserId(userId); + shopUser.setId(null); + save(shopUser); + } + return shopUser; + } } From c1777813f5292fcc3825b6949a63102340f9f5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Fri, 14 Feb 2025 16:24:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=BA=97=E9=93=BA=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/account/service/impl/ShopUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d4448658..8304e7c5 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 @@ -90,7 +90,7 @@ public class ShopUserServiceImpl extends ServiceImpl @Override public ShopUser getShopUserInfo(Long shopId, long userId) { - ShopUser shopUser = queryChain().eq(ShopUser::getShopId, StpKit.USER.getShopId()).eq(ShopUser::getId, StpKit.USER.getLoginIdAsLong()).one(); + ShopUser shopUser = queryChain().eq(ShopUser::getShopId, shopId).eq(ShopUser::getUserId, userId).one(); if (shopUser == null) { shopUser = new ShopUser(); UserInfo userInfo = userInfoService.getById(userId);