From c8ea2d96f5b0522a09f3203ae98fe796084d2d15 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期六, 04 一月 2025 09:34:21 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java index bb93baa..5465fac 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java @@ -6,10 +6,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.api.model.AgentApplication; import com.ruoyi.account.api.model.AppUser; +import com.ruoyi.account.api.model.AppUserShop; import com.ruoyi.account.dto.AgentQuery; import com.ruoyi.account.mapper.AgentApplicationMapper; import com.ruoyi.account.service.AgentApplicationService; import com.ruoyi.account.service.AppUserService; +import com.ruoyi.account.service.AppUserShopService; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.Shop; @@ -42,6 +44,11 @@ @Resource private ShopClient shopClient; + @Resource + private AppUserShopService appUserShopService; + + + @Override public void apply(AgentApplication agentApplication) { LoginUser loginUserApplet = tokenService.getLoginUserApplet(); @@ -62,13 +69,12 @@ // 直推用户已成为代理数量 List<AppUser> directAgentUserList = appUserService.list(new LambdaQueryWrapper<AppUser>() .eq(AppUser::getInviteUserId, appUser.getId()) - .eq(AppUser::getUserType, 4)); + .eq(AppUser::getVipId, 4)); agentApplication.setDirectAgentNum(directAgentUserList.size()); // 已绑定门店数量 - R<List<Shop>> R = shopClient.getShopByUserIds(Collections.singletonList(loginUserApplet.getUserid())); - List<Shop> shopList = R.getData(); - agentApplication.setBindShopNum(shopList.size()); + long count = appUserShopService.count(new LambdaQueryWrapper<AppUserShop>().eq(AppUserShop::getAppUserId, loginUserApplet.getUserid())); + agentApplication.setBindShopNum(Long.valueOf(count).intValue()); agentApplicationMapper.insert(agentApplication); } -- Gitblit v1.7.1