From c0c140fcdf54a814877575a057b3aeb19d7ececd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Sat, 11 Jul 2026 19:30:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=B7=BB=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E5=92=8C=E5=BA=97?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在数据库用户表中新增 audit_status 和 shop_name 字段 - 在用户实体类中添加 shopName 属性 - 登录参数类中新增 auditStatus 字段，支持前端传值控制审核流程 - 主控制器中增加对注册人姓名和店名的非空校验逻辑 - 注册用户时默认审核通过，支持 auditStatus=0 时进入审核流程 - 查询用户信息接口返回包含审核状态、驳回原因及地址完整性判断信息 - 用户服务实现中根据传入参数设置用户审核状态 --- sql/add_user_audit_status.sql | 3 ++- .../common/system/controller/MainController.java | 15 ++++++++++++--- .../com/gxwebsoft/common/system/entity/User.java | 3 +++ .../gxwebsoft/common/system/param/LoginParam.java | 3 +++ .../system/service/impl/UserServiceImpl.java | 2 ++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sql/add_user_audit_status.sql b/sql/add_user_audit_status.sql index 86ebec5..998703f 100644 --- a/sql/add_user_audit_status.sql +++ b/sql/add_user_audit_status.sql @@ -4,4 +4,5 @@ ALTER TABLE sys_user ADD COLUMN audit_status INT DEFAULT NULL COMMENT '审核状态: 0待审核, 1已通过, 2已拒绝', - ADD COLUMN reject_reason VARCHAR(500) DEFAULT NULL COMMENT '审核驳回原因'; + ADD COLUMN reject_reason VARCHAR(500) DEFAULT NULL COMMENT '审核驳回原因', + ADD COLUMN shop_name VARCHAR(100) DEFAULT NULL COMMENT '店名'; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index eedeb56..80090b5 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -361,12 +361,17 @@ public class MainController extends BaseController { if (userId == null) { return fail("用户未登录", null); } - if (StrUtil.hasBlank(param.getProvince(), param.getCity(), param.getRegion(), param.getAddress())) { - return fail("请填写完整的地址信息", null); + if (StrUtil.hasBlank(param.getRealName(), param.getShopName())) { + return fail("请填写注册人和店名", null); + } + if (StrUtil.hasBlank(param.getProvince(), param.getCity(), param.getRegion())) { + return fail("请选择所在地区", null); } User update = new User(); update.setUserId(userId); update.setCountry("中国"); + update.setRealName(param.getRealName()); + update.setShopName(param.getShopName()); update.setProvince(param.getProvince()); update.setCity(param.getCity()); update.setRegion(param.getRegion()); @@ -390,7 +395,9 @@ public class MainController extends BaseController { java.util.Map result = new java.util.HashMap<>(); result.put("auditStatus", user.getAuditStatus()); result.put("rejectReason", user.getRejectReason()); - result.put("hasAddress", StrUtil.isNotBlank(user.getProvince()) && StrUtil.isNotBlank(user.getAddress())); + result.put("hasAddress", StrUtil.isNotBlank(user.getRealName()) + && StrUtil.isNotBlank(user.getShopName()) + && StrUtil.isNotBlank(user.getProvince())); return success(result); } @@ -725,6 +732,8 @@ public class MainController extends BaseController { final UserParam userParam = new UserParam(); userParam.setPhone(phone); userParam.setTenantId(tenantId); + // 前端传 auditStatus=0 时走审核流程（新用户待审核） + userParam.setAuditStatus(param.getAuditStatus()); user = userService.addUser(userParam); } if (!user.getStatus().equals(0)) { diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index d70f6bf..4939cf1 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -114,6 +114,9 @@ public class User implements UserDetails { @Schema(description = "街道地址") private String address; + @Schema(description = "店名") + private String shopName; + @Schema(description = "行业类型(父级)") private String industryParent; diff --git a/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java b/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java index e1ad55a..41d67f2 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/LoginParam.java @@ -55,4 +55,7 @@ public class LoginParam implements Serializable { @Schema(description = "租户id") private Integer tenantId; + @Schema(description = "审核状态: 0待审核, 1已通过, 2已拒绝（前端传值决定注册是否走审核流程）") + private Integer auditStatus; + } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java index ec73e60..4842db5 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserServiceImpl.java @@ -277,6 +277,8 @@ public class UserServiceImpl extends ServiceImpl implements Us User addUser = new User(); // 注册用户 addUser.setStatus(0); + // 默认审核通过；前端传 auditStatus=0 时走审核流程 + addUser.setAuditStatus(userParam.getAuditStatus() != null ? userParam.getAuditStatus() : 1); if(userParam.getUsername() != null){ addUser.setUsername(userParam.getUsername()); }