hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新代理政策-目标初始化countryCode改为根据团队长国家

Browse Source
This commit is contained in:
tianfeng 2026-02-03 19:40:12 +08:00
parent 4878c1755c
commit 030449ab6a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/TeamTargetCommon.java
View File

@ -130,7 +130,7 @@ public class TeamTargetCommon {
Boolean.FALSE); Boolean.FALSE);
} }
UserProfile userProfile = userProfileGateway.getByUserId(userId); UserProfile userProfile = userProfileGateway.getByUserId(teamProfile.getOwnUserId());
// 成员目标单据不存在 // 成员目标单据不存在
if (Boolean.FALSE.equals(existsBillTarget(userId))) { if (Boolean.FALSE.equals(existsBillTarget(userId))) {

6
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/common/team/decay/UpdateMemberTeamDecay.java
View File

@ -97,9 +97,6 @@ public class UpdateMemberTeamDecay {
TeamProfile teamProfile = teamProfileService.getById(teamMember.getTeamId()); TeamProfile teamProfile = teamProfileService.getById(teamMember.getTeamId());
ResponseAssert.notNull(TeamErrorCode.USER_NOT_TEAM_MEMBER, teamProfile); ResponseAssert.notNull(TeamErrorCode.USER_NOT_TEAM_MEMBER, teamProfile);
UserProfile userProfile = userProfileGateway.getByUserId(param.getMemberUserId());
ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile);
// 移除成员 // 移除成员
TeamMember removeTeamMember = processRemoveTeamMember(teamMember.getSortId()); TeamMember removeTeamMember = processRemoveTeamMember(teamMember.getSortId());
if (Objects.isNull(removeTeamMember)) { if (Objects.isNull(removeTeamMember)) {
@ -141,6 +138,9 @@ public class UpdateMemberTeamDecay {
.setCreateUser(param.getUpdateUser()) .setCreateUser(param.getUpdateUser())
); );
UserProfile userProfile = userProfileGateway.getByUserId(param.getMemberUserId());
ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, newTeamProfile.getOwnUserId());
// 移除历史申请 // 移除历史申请
teamApplicationProcessService.removeByUserId(param.getMemberUserId()); teamApplicationProcessService.removeByUserId(param.getMemberUserId());

2
rc-service/rc-service-other/other-inner-endpoint/src/main/java/com/red/circle/other/app/inner/service/team/impl/TeamBillCycleClientServiceImpl.java
View File

@ -334,7 +334,7 @@ public class TeamBillCycleClientServiceImpl implements TeamBillCycleClientServic
teamProfileService.getById(teamMember.getTeamId()); teamProfileService.getById(teamMember.getTeamId());
ResponseAssert.notNull(TeamErrorCode.TEAM_NOT_FOUND, teamProfile); ResponseAssert.notNull(TeamErrorCode.TEAM_NOT_FOUND, teamProfile);
UserProfile userProfile = userProfileGateway.getByUserId(teamMember.getMemberId()); UserProfile userProfile = userProfileGateway.getByUserId(teamProfile.getOwnUserId());
ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile); ResponseAssert.notNull(UserErrorCode.USER_INFO_NOT_FOUND, userProfile);
Boolean isOpenAutoSalary = isOpenDailyAutoSalary(teamProfile.getRegion()); Boolean isOpenAutoSalary = isOpenDailyAutoSalary(teamProfile.getRegion());