diff --git a/seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java b/seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java index ff2e9cf..a635d6b 100644 --- a/seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java +++ b/seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java @@ -336,6 +336,7 @@ public enum ResultCodeEnum { PARTICIPATION_FAILED(13010, "参与活动失败"), PARENT_NOT_FOUND(13011, "家长不存在"), INVALID_ACTIVITY_STATUS(13012, "无效的活动状态"), + AGENT_NOT_FOUND(13013, "代理商不存在"), PARENT_ALREADY_SIGN_UP(130121, "已经报名参加该活动"); private int code; diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationReq.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationReq.java index 230bc4f..7a89e8d 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationReq.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationReq.java @@ -3,8 +3,6 @@ package com.seer.teach.mp.admin.controller.req; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import jakarta.validation.constraints.NotNull; - @Schema(name = "AgentEmployeeRelationReq", description = "代理商员工关联请求参数") @Data public class AgentEmployeeRelationReq { @@ -12,11 +10,9 @@ public class AgentEmployeeRelationReq { @Schema(description = "关联ID") private Integer id; - @NotNull(message = "代理商ID不能为空") @Schema(description = "代理商ID") private Integer agentId; - @NotNull(message = "员工用户ID不能为空") @Schema(description = "员工用户ID") private Integer employeeUserId; diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeSaveReq.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeSaveReq.java index 97983bf..067adc9 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeSaveReq.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeSaveReq.java @@ -17,10 +17,6 @@ public class AgentEmployeeSaveReq { @NotNull(message = "员工名称不能为空") private String employeeName; - @Schema(description = "员工密码") - @NotNull(message = "员工密码不能为空") - private String password; - @Schema(description = "员工职位") private String position; diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java index c6d52b7..c8b23a3 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java @@ -27,7 +27,7 @@ public interface IAdminAgentEmployeeRelationService { PageListBean pageList(AgentEmployeeRelationQueryReq query); /** - * 创建或更新代理商员工关联(管理端) + * 更新代理商员工关联(管理端) * * @param request 关联请求对象 * @return 操作是否成功 diff --git a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java index 020d2ec..6a14a15 100644 --- a/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java +++ b/seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java @@ -17,7 +17,6 @@ import com.seer.teach.mp.entity.MpAgentEntity; import com.seer.teach.mp.service.IMpAgentEmployeeRelationService; import com.seer.teach.mp.service.IMpAgentService; import com.seer.teach.user.api.UserInfoServiceApi; -import com.seer.teach.user.api.dto.UserInfoDTO; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -83,15 +82,11 @@ public class AdminAgentEmployeeRelationServiceImpl implements IAdminAgentEmploye MpAgentEmployeeRelationEntity one = agentEmployeeRelationService.lambdaQuery() .eq(MpAgentEmployeeRelationEntity::getEmployeeName, request.getEmployeeName()).one(); AssertUtils.isNull(one, ResultCodeEnum.AGENT_EMPLOYEE_ALREADY_EXISTS); - UserInfoDTO userInfoDTO = new UserInfoDTO(); - userInfoDTO.setUserName(request.getEmployeeName()); - userInfoDTO.setPassword(request.getPassword()); - userInfoServiceApi.saveAgentInfo(userInfoDTO); - Integer employeeUserId = userInfoServiceApi.getUserIdByUserName(request.getEmployeeName()); Integer agentId = mpAgentService.lambdaQuery().eq(MpAgentEntity::getAgentName, request.getAgentName()).one().getId(); + Integer employeeId = userInfoServiceApi.getUserIdByUserName(request.getEmployeeName()); MpAgentEmployeeRelationEntity entity = new MpAgentEmployeeRelationEntity(); entity.setAgentId(agentId); - entity.setEmployeeUserId(employeeUserId); + entity.setEmployeeUserId(employeeId); entity.setEmployeeName(request.getEmployeeName()); entity.setAgentName(request.getAgentName()); entity.setPosition(request.getPosition()); diff --git a/seer-user/seer-user-service/src/main/java/com/seer/teach/user/admin/api/UserInfoServiceApiImpl.java b/seer-user/seer-user-service/src/main/java/com/seer/teach/user/admin/api/UserInfoServiceApiImpl.java index 53dbb17..c23d156 100644 --- a/seer-user/seer-user-service/src/main/java/com/seer/teach/user/admin/api/UserInfoServiceApiImpl.java +++ b/seer-user/seer-user-service/src/main/java/com/seer/teach/user/admin/api/UserInfoServiceApiImpl.java @@ -284,10 +284,8 @@ public class UserInfoServiceApiImpl implements UserInfoServiceApi { public Integer getUserIdByUserName(String userName) { UserEntity userEntity = userService.getOne(new LambdaQueryWrapper() .eq(UserEntity::getUserName, userName)); - if (Objects.nonNull(userEntity)) { - return userEntity.getId(); - } - return null; + AssertUtils.notNull(userEntity, ResultCodeEnum.USER_NOT_FOUND); + return userEntity.getId(); } @Override