From f2cbf3f28286e68c7f54a980091e131d6500b613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=9D=A1=E8=A7=89=E7=9A=84=E6=9C=88=E4=BA=AE?= <97796069+Cookies-OvO@users.noreply.github.com> Date: Thu, 4 Dec 2025 15:59:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E9=98=9F=E7=AE=A1=E7=90=86-=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yzt/admin/controller/UserController.java | 12 ++++++++++ .../response/UserSearchAdminResponse.java | 23 +++++++++++++++++++ .../com/yzt/service/mapper/UserMapper.java | 9 ++++++++ .../com/yzt/service/service/UserService.java | 7 ++++++ .../service/service/impl/UserServiceImpl.java | 9 ++++++++ .../main/resources/mapper/user/UserMapper.xml | 19 +++++++++++++++ 6 files changed, 79 insertions(+) create mode 100644 fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java diff --git a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java index 8c132ae..d5d4eee 100644 --- a/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java +++ b/fightwine-admin/src/main/java/com/yzt/admin/controller/UserController.java @@ -8,6 +8,7 @@ import com.yzt.common.response.TopDetail; import com.yzt.common.response.UserBrokerageRecordResponse; import com.yzt.common.response.UserCenterResponse; import com.yzt.common.response.UserResponse; +import com.yzt.common.response.UserSearchAdminResponse; import com.yzt.common.result.CommonResult; import com.yzt.service.service.UserBrokerageRecordService; import com.yzt.service.service.UserService; @@ -234,6 +235,17 @@ public class UserController { } return CommonResult.failed("更新失败"); } + + /** + * 后台管理用户搜索：通过手机号或企业名称模糊查询 + * @param keyword 搜索关键字（手机号码或企业名称） + */ + @ApiOperation(value = "用户搜索（手机号/企业名称）") + @RequestMapping(value = "/search", method = RequestMethod.GET) + public CommonResult> searchUsers(@RequestParam(value = "keyword", required = false) String keyword) { + List userList = userService.searchUsersByKeyword(keyword); + return CommonResult.success(userList); + } } diff --git a/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java new file mode 100644 index 0000000..2f31119 --- /dev/null +++ b/fightwine-common/src/main/java/com/yzt/common/response/UserSearchAdminResponse.java @@ -0,0 +1,23 @@ +package com.yzt.common.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 后台管理用户搜索响应体 + */ +@Data +public class UserSearchAdminResponse { + + @ApiModelProperty(value = "用户id") + private Integer uid; + + @ApiModelProperty(value = "客户名称") + private String nickname; + + @ApiModelProperty(value = "手机号码") + private String phone; + + @ApiModelProperty(value = "企业名称") + private String tenantName; +} diff --git a/fightwine-service/src/main/java/com/yzt/service/mapper/UserMapper.java b/fightwine-service/src/main/java/com/yzt/service/mapper/UserMapper.java index 9541cc7..15305c5 100644 --- a/fightwine-service/src/main/java/com/yzt/service/mapper/UserMapper.java +++ b/fightwine-service/src/main/java/com/yzt/service/mapper/UserMapper.java @@ -2,7 +2,9 @@ package com.yzt.service.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yzt.common.model.user.User; +import com.yzt.common.response.UserSearchAdminResponse; import com.yzt.common.response.UserSpreadPeopleItemResponse; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -16,4 +18,11 @@ public interface UserMapper extends BaseMapper { List getSpreadPeopleList(Map map); List findAdminList(Map map); + + /** + * 后台管理用户搜索：通过手机号或企业名称模糊查询 + * @param keyword 搜索关键字 + * @return 用户列表 + */ + List searchUsersByPhoneOrTenant(@Param("keyword") String keyword); } diff --git a/fightwine-service/src/main/java/com/yzt/service/service/UserService.java b/fightwine-service/src/main/java/com/yzt/service/service/UserService.java index 5f62c42..79f91cc 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/UserService.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/UserService.java @@ -371,4 +371,11 @@ public interface UserService extends IService { */ User getReferInfo(); + /** + * 后台管理用户搜索：通过手机号或企业名称模糊查询 + * @param keyword 搜索关键字 + * @return 用户列表 + */ + List searchUsersByKeyword(String keyword); + } diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java index c6a30c7..9a401a2 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/UserServiceImpl.java @@ -1998,6 +1998,15 @@ public class UserServiceImpl extends ServiceImpl implements Us return update(luw); } + /** + * 后台管理用户搜索：通过手机号或企业名称模糊查询 + * @param keyword 搜索关键字 + * @return 用户列表 + */ + @Override + public List searchUsersByKeyword(String keyword) { + return userMapper.searchUsersByPhoneOrTenant(keyword); + } } diff --git a/fightwine-service/src/main/resources/mapper/user/UserMapper.xml b/fightwine-service/src/main/resources/mapper/user/UserMapper.xml index 52b1e2d..bb8ce1a 100644 --- a/fightwine-service/src/main/resources/mapper/user/UserMapper.xml +++ b/fightwine-service/src/main/resources/mapper/user/UserMapper.xml @@ -95,4 +95,23 @@ ORDER BY u.uid desc + + +