From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AgentApplicationServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 bbee426..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
@@ -1,12 +1,17 @@
package com.ruoyi.account.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -39,12 +44,18 @@
@Resource
private ShopClient shopClient;
+ @Resource
+ private AppUserShopService appUserShopService;
+
+
+
@Override
public void apply(AgentApplication agentApplication) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
AppUser appUser = appUserService.getById(loginUserApplet.getUserid());
agentApplication.setAppUserId(loginUserApplet.getUserid());
+ agentApplication.setStatus(1);
agentApplication.setApplicationTime(LocalDateTime.now());
agentApplication.setShopPoint(appUser.getShopPoint());
agentApplication.setSharePoint(appUser.getSharePoint());
@@ -58,13 +69,21 @@
// 直推用户已成为代理数量
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);
}
+
+ @Override
+ public IPage<AgentApplication> pageList(AgentQuery agentQuery) {
+ Page<Shop> page = new Page<>();
+ page.setCurrent(agentQuery.getPageNum());
+ page.setSize(agentQuery.getPageSize());
+ IPage<AgentApplication> shopIPage = agentApplicationMapper.pageList(page, agentQuery);
+ return shopIPage;
+ }
}
--
Gitblit v1.7.1