diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 7101ddb..3e4f402 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -35,7 +35,8 @@ "Bash(cat \"/e/code/智柜宝/shop-back-end/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java\")", "Bash(cat \"/e/code/智柜宝/shop-back-end/agileboot-domain/src/main/java/com/agileboot/domain/system/user/query/SearchUserQuery.java\")", "Bash(./mvnw clean compile -pl agileboot-api -am -DskipTests)", - "Bash(./mvnw clean compile -pl agileboot-api,agileboot-domain -am -DskipTests)" + "Bash(./mvnw clean compile -pl agileboot-api,agileboot-domain -am -DskipTests)", + "Bash(./mvnw clean compile -pl agileboot-domain -am -DskipTests)" ], "deny": [], "ask": [] diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/WxUserApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/WxUserApplicationService.java index 713fcf9..c342d19 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/WxUserApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/WxUserApplicationService.java @@ -215,6 +215,15 @@ public class WxUserApplicationService { userDTO = getUserDetailByOpenid(openid); } + // 如果该用户绑定了ab98UserId,则查询Ab98User信息并设置到DTO中 + if (userDTO != null && userDTO.getAb98UserId() != null) { + Ab98UserEntity ab98UserEntity = ab98UserService.getById(userDTO.getAb98UserId()); + if (ab98UserEntity != null) { + userDTO.setAb98Name(ab98UserEntity.getName()); + userDTO.setAb98FaceImg(ab98UserEntity.getFaceImg()); + } + } + return userDTO; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/dto/WxUserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/dto/WxUserDTO.java index a7a219c..378e9bc 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/dto/WxUserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/wx/user/dto/WxUserDTO.java @@ -68,4 +68,10 @@ public class WxUserDTO { @ExcelColumn(name = "备注") private String remark; + + @ExcelColumn(name = "汇邦云用户名") + private String ab98Name; + + @ExcelColumn(name = "汇邦云用户头像") + private String ab98FaceImg; }