Java/seer-teach-cloud-21
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-chenjiajian'

Browse Source 
# Conflicts:
#	seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java
#	seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/impl/AdminAgentEmployeeRelationServiceImpl.java
This commit is contained in:
Wang 2026-01-09 09:32:11 +08:00
commit 461b830d33
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
seer-common/common-enums/src/main/java/com/seer/teach/common/enums/ResultCodeEnum.java
View File

@ -337,6 +337,8 @@ public enum ResultCodeEnum {
PARTICIPATION_FAILED(13010, "参与活动失败"),
PARENT_NOT_FOUND(13011, "家长不存在"),
INVALID_ACTIVITY_STATUS(13012, "无效的活动状态"),
AGENT_NOT_FOUND(13013, "代理商不存在"),
PARENT_ALREADY_SIGN_UP(130121, "已经报名参加该活动");
PARENT_ALREADY_SIGN_UP(130121, "已经报名参加该活动"),
UNAUTHORIZED_UPDATE_EMPLOYEE(13013, "无权限更新员工信息"),
DATA_REPEAT_ERROR(130014, "数据重复"),

4
seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeRelationReq.java
View File

@ -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;

4
seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/controller/req/AgentEmployeeSaveReq.java
View File

@ -17,10 +17,6 @@ public class AgentEmployeeSaveReq {
@NotNull(message = "员工名称不能为空")
private String employeeName;
@Schema(description = "员工密码")
@NotNull(message = "员工密码不能为空")
private String password;
@Schema(description = "员工职位")
private String position;

2
seer-mp/seer-mp-service-admin/src/main/java/com/seer/teach/mp/admin/service/IAdminAgentEmployeeRelationService.java
View File

@ -27,7 +27,7 @@ public interface IAdminAgentEmployeeRelationService {
PageListBean<AgentEmployeeRelationResp> pageList(AgentEmployeeRelationQueryReq query);
/**
* 创建或更新代理商员工关联（管理端）
* 更新代理商员工关联（管理端）
*
* @param request 关联请求对象
* @return 操作是否成功

4
seer-user/seer-user-service/src/main/java/com/seer/teach/user/admin/api/UserInfoServiceApiImpl.java
View File

@ -304,11 +304,9 @@ public class UserInfoServiceApiImpl implements UserInfoServiceApi {
public Integer getUserIdByUserName(String userName) {
UserEntity userEntity = userService.getOne(new LambdaQueryWrapper<UserEntity>()
.eq(UserEntity::getUserName, userName));
if (Objects.nonNull(userEntity)) {
AssertUtils.notNull(userEntity, ResultCodeEnum.USER_NOT_FOUND);
return userEntity.getId();
}
return null;
}
/**
* 推送更新孩子信息的MQ消息