From 08e7ab41502af990f0e2c1d930259ea95cad426b Mon Sep 17 00:00:00 2001 From: Wang Date: Fri, 16 Jan 2026 11:55:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BD=93=E5=89=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=94=A8=E6=88=B7=E5=92=8C=E4=BB=A3=E7=90=86=E5=95=86?= =?UTF-8?q?=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teach/mp/app/service/IAppAgentService.java | 4 +++- .../AppAgentActivityParentInfoServiceImpl.java | 18 ++++++++---------- ...AppAgentActivityParticipantServiceImpl.java | 7 +++---- .../app/service/impl/AppAgentServiceImpl.java | 11 +++++++---- .../IMpAgentEmployeeRelationService.java | 4 +++- .../MpAgentEmployeeRelationServiceImpl.java | 4 ++-- 6 files changed, 26 insertions(+), 22 deletions(-) diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/IAppAgentService.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/IAppAgentService.java index 7f868dd..a8915ed 100644 --- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/IAppAgentService.java +++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/IAppAgentService.java @@ -2,6 +2,8 @@ package com.seer.teach.mp.app.service; import com.seer.teach.mp.app.controller.resp.AppMpAgentResp; +import java.util.List; + /** * App端代理商服务接口 */ @@ -21,5 +23,5 @@ public interface IAppAgentService { * @param userId 用户ID * @return 代理商ID */ - Integer getAgentIdByUserId(Integer userId); + List getAgentIdListByUserId(Integer userId); } \ No newline at end of file diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParentInfoServiceImpl.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParentInfoServiceImpl.java index 62b8267..2d2ae8a 100644 --- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParentInfoServiceImpl.java +++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParentInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.seer.teach.mp.app.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.seer.teach.common.PageListBean; @@ -17,7 +18,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; /** @@ -38,12 +38,11 @@ public class AppAgentActivityParentInfoServiceImpl implements IAppAgentActivityP @Override public List getParentsByActivityAndAgent(Integer activityId, Integer agentId,Integer userId) { - var userAgentId = appAgentService.getAgentIdByUserId(userId); - if (Objects.isNull(userAgentId)) { + var userAgentIds = appAgentService.getAgentIdListByUserId(userId); + if (CollectionUtil.isEmpty(userAgentIds)) { return List.of(); } - log.info("getParentsByActivityAndAgent userAgentId:{}", userAgentId); - if(userAgentId.intValue() != agentId){ + if(!userAgentIds.contains(agentId)){ throw new CommonException(ResultCodeEnum.RELATION_NOT_FOUND); } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -61,12 +60,11 @@ public class AppAgentActivityParentInfoServiceImpl implements IAppAgentActivityP @Override public PageListBean getParentsByActivityAndAgent(Integer userId,AgentActivityParentQueryReq queryReq) { - var userAgentId = appAgentService.getAgentIdByUserId(userId); - if (Objects.isNull(userAgentId)) { + var userAgentIds = appAgentService.getAgentIdListByUserId(userId); + if (CollectionUtil.isEmpty(userAgentIds)) { return new PageListBean<>(); } - log.info("userAgentId:{}", userAgentId); - if(userAgentId.intValue() != queryReq.getAgentId()){ + if(!userAgentIds.contains(queryReq.getAgentId())){ throw new CommonException(ResultCodeEnum.RELATION_NOT_FOUND); } // 创建分页对象 @@ -75,7 +73,7 @@ public class AppAgentActivityParentInfoServiceImpl implements IAppAgentActivityP // 构建查询条件 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MpActivityInfoCollectionEntity::getActivityId, queryReq.getActivityId()) - .eq(MpActivityInfoCollectionEntity::getAgentId, userAgentId); + .eq(MpActivityInfoCollectionEntity::getAgentId, queryReq.getAgentId()); // 执行分页查询 Page pageResult = activityInfoCollectionService.page(page, queryWrapper); diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParticipantServiceImpl.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParticipantServiceImpl.java index 8b20643..0cf72f3 100644 --- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParticipantServiceImpl.java +++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentActivityParticipantServiceImpl.java @@ -56,12 +56,11 @@ public class AppAgentActivityParticipantServiceImpl implements IAppAgentActivity @Override public List getParticipantsByActivityAndAgent(Integer agentId, Integer userId) { - var userAgentId = appAgentService.getAgentIdByUserId(userId); - if (Objects.isNull(userAgentId)) { + var userAgentIds = appAgentService.getAgentIdListByUserId(userId); + if (CollectionUtil.isEmpty(userAgentIds)) { return List.of(); } - log.info("userAgentId:{}", userAgentId); - if(userAgentId.intValue() != agentId){ + if(!userAgentIds.contains(agentId) ){ throw new CommonException(ResultCodeEnum.RELATION_NOT_FOUND); } var participants = agentActivityParticipantService.getListByAgentId(agentId); diff --git a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentServiceImpl.java b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentServiceImpl.java index 08a13a2..22642a1 100644 --- a/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentServiceImpl.java +++ b/seer-mp/seer-mp-service-app/src/main/java/com/seer/teach/mp/app/service/impl/AppAgentServiceImpl.java @@ -1,5 +1,6 @@ package com.seer.teach.mp.app.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.seer.teach.common.enums.ResultCodeEnum; import com.seer.teach.common.utils.AssertUtils; import com.seer.teach.mp.app.controller.resp.AppMpAgentResp; @@ -12,7 +13,9 @@ import com.seer.teach.mp.service.IMpAgentService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * App端代理商服务实现类 @@ -40,11 +43,11 @@ public class AppAgentServiceImpl implements IAppAgentService { } @Override - public Integer getAgentIdByUserId(Integer userId) { - MpAgentEmployeeRelationEntity mpAgentEmployeeRelationEntity = mpAgentEmployeeRelationService.getOneByUserId(userId); - if (mpAgentEmployeeRelationEntity == null) { + public List getAgentIdListByUserId(Integer userId) { + List mpAgentEmployeeRelations = mpAgentEmployeeRelationService.getListByUserId(userId); + if (CollectionUtil.isEmpty(mpAgentEmployeeRelations)) { return null; } - return mpAgentEmployeeRelationEntity.getAgentId(); + return mpAgentEmployeeRelations.stream().map(MpAgentEmployeeRelationEntity::getAgentId).collect(Collectors.toList()); } } \ No newline at end of file diff --git a/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/IMpAgentEmployeeRelationService.java b/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/IMpAgentEmployeeRelationService.java index fd7a546..ffb7857 100644 --- a/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/IMpAgentEmployeeRelationService.java +++ b/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/IMpAgentEmployeeRelationService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.seer.teach.mp.entity.MpAgentEmployeeRelationEntity; +import java.util.List; + /** *

* 代理商员工关联表 服务类 @@ -62,5 +64,5 @@ public interface IMpAgentEmployeeRelationService extends IService getListByUserId(Integer userId); } \ No newline at end of file diff --git a/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/impl/MpAgentEmployeeRelationServiceImpl.java b/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/impl/MpAgentEmployeeRelationServiceImpl.java index 3d24be3..661997e 100644 --- a/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/impl/MpAgentEmployeeRelationServiceImpl.java +++ b/seer-mp/seer-mp-service/src/main/java/com/seer/teach/mp/service/impl/MpAgentEmployeeRelationServiceImpl.java @@ -95,7 +95,7 @@ public class MpAgentEmployeeRelationServiceImpl extends ServiceImpl(MpAgentEmployeeRelationEntity.class).eq(MpAgentEmployeeRelationEntity::getEmployeeUserId, userId)); + public List getListByUserId(Integer userId) { + return super.list(new LambdaQueryWrapper<>(MpAgentEmployeeRelationEntity.class).eq(MpAgentEmployeeRelationEntity::getEmployeeUserId, userId)); } } \ No newline at end of file