增加短信登录

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mp/EnterpriseController.java

@@ -8,12 +8,10 @@ import com.huimv.employment.security.LoginUserHolder;
 import com.huimv.employment.service.enterprise.EnterpriseService;
 import com.huimv.employment.service.enterprise.dto.EnterpriseRegisterRequest;
 import com.huimv.employment.service.enterprise.dto.EnterpriseRegisterResponse;
-import com.huimv.employment.service.enterprise.dto.EnterpriseStatusResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,13 +35,6 @@ public class EnterpriseController {
         this.enterpriseService = enterpriseService;
     }
 
-    @GetMapping
-    @Operation(summary = "查询登记状态")
-    public R<EnterpriseStatusResponse> getStatus() {
-        LoginUser loginUser = requireEnterprise();
-        return R.ok(enterpriseService.getStatus(loginUser.getUserId()));
-    }
-
     @PostMapping("/register")
     @Operation(summary = "提交企业登记")
     public R<EnterpriseRegisterResponse> register(@Validated @RequestBody EnterpriseRegisterRequest request) {

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mp/ProfileController.java

@@ -0,0 +1,36 @@
+package com.huimv.employment.controller.mp;
+
+import com.huimv.employment.common.web.R;
+import com.huimv.employment.security.LoginUser;
+import com.huimv.employment.security.LoginUserHolder;
+import com.huimv.employment.service.auth.ProfileService;
+import com.huimv.employment.service.auth.dto.MpUserInfoResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 小程序通用接口。
+ */
+@RestController
+@RequestMapping("/api/v1/mp")
+@Tag(name = "小程序", description = "用户信息等")
+@SecurityRequirement(name = "Authorization")
+public class ProfileController {
+
+    private final ProfileService profileService;
+
+    public ProfileController(ProfileService profileService) {
+        this.profileService = profileService;
+    }
+
+    @GetMapping("/getInfo")
+    @Operation(summary = "查询当前用户登记状态与详情")
+    public R<MpUserInfoResponse> getInfo() {
+        LoginUser loginUser = LoginUserHolder.require();
+        return R.ok(profileService.getInfo(loginUser.getUserId(), loginUser.getUserType()));
+    }
+}

huimv-employment/fe-api/src/main/java/com/huimv/employment/controller/mp/WorkerController.java

@@ -8,12 +8,10 @@ import com.huimv.employment.security.LoginUserHolder;
 import com.huimv.employment.service.worker.WorkerService;
 import com.huimv.employment.service.worker.dto.WorkerRegisterRequest;
 import com.huimv.employment.service.worker.dto.WorkerRegisterResponse;
-import com.huimv.employment.service.worker.dto.WorkerStatusResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,13 +37,6 @@ public class WorkerController {
         this.workerService = workerService;
     }
 
-    @GetMapping
-    @Operation(summary = "查询登记状态")
-    public R<WorkerStatusResponse> getStatus() {
-        LoginUser loginUser = requireWorker();
-        return R.ok(workerService.getStatus(loginUser.getUserId()));
-    }
-
     @PostMapping("/register")
     @Operation(summary = "提交登记")
     public R<WorkerRegisterResponse> register(@Validated @RequestBody WorkerRegisterRequest request,

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/auth/ProfileService.java

@@ -0,0 +1,96 @@
+package com.huimv.employment.service.auth;
+
+import com.huimv.employment.common.exception.BizException;
+import com.huimv.employment.common.exception.ErrorCode;
+import com.huimv.employment.dao.entity.FeEnterprise;
+import com.huimv.employment.dao.entity.FeUser;
+import com.huimv.employment.dao.entity.FeWorker;
+import com.huimv.employment.dao.mapper.FeUserMapper;
+import com.huimv.employment.service.auth.dto.MpUserInfoResponse;
+import com.huimv.employment.service.enterprise.EnterpriseService;
+import com.huimv.employment.service.worker.WorkerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 小程序用户综合信息查询。
+ */
+@Service
+public class ProfileService {
+
+    private static final String USER_TYPE_ENTERPRISE = "enterprise";
+    private static final String USER_TYPE_WORKER = "worker";
+
+    private final FeUserMapper feUserMapper;
+    private final EnterpriseService enterpriseService;
+    private final WorkerService workerService;
+
+    public ProfileService(FeUserMapper feUserMapper,
+                          EnterpriseService enterpriseService,
+                          WorkerService workerService) {
+        this.feUserMapper = feUserMapper;
+        this.enterpriseService = enterpriseService;
+        this.workerService = workerService;
+    }
+
+    public MpUserInfoResponse getInfo(Long userId, String userType) {
+        FeUser user = feUserMapper.selectById(userId);
+        if (user == null) {
+            throw new BizException(ErrorCode.UNAUTHORIZED);
+        }
+
+        MpUserInfoResponse response = new MpUserInfoResponse();
+        response.setUserType(userType);
+        response.setMobileMask(user.getMobileMask());
+
+        if (USER_TYPE_ENTERPRISE.equals(userType)) {
+            enterpriseService.requireEnterpriseUser(userId);
+            FeEnterprise enterprise = enterpriseService.findEnterpriseByUserId(userId);
+            if (enterprise == null) {
+                response.setRegistered(false);
+            } else {
+                response.setRegistered(true);
+                response.setEnterprise(toEnterpriseInfo(enterprise));
+            }
+        } else if (USER_TYPE_WORKER.equals(userType)) {
+            workerService.requireWorkerUser(userId);
+            FeWorker worker = workerService.findWorkerByUserId(userId);
+            if (worker == null) {
+                response.setRegistered(false);
+            } else {
+                response.setRegistered(true);
+                response.setWorker(toWorkerInfo(worker));
+            }
+        } else {
+            throw new BizException(ErrorCode.BAD_REQUEST, "不支持的用户类型");
+        }
+        return response;
+    }
+
+    private static MpUserInfoResponse.EnterpriseInfo toEnterpriseInfo(FeEnterprise enterprise) {
+        MpUserInfoResponse.EnterpriseInfo info = new MpUserInfoResponse.EnterpriseInfo();
+        info.setEnterpriseId(enterprise.getId());
+        info.setEnterpriseCode(enterprise.getEnterpriseCode());
+        info.setName(enterprise.getName());
+        info.setCreditCode(enterprise.getCreditCode());
+        info.setLegalPerson(enterprise.getLegalPerson());
+        info.setRegisteredAddress(enterprise.getRegisteredAddress());
+        info.setContactName(enterprise.getContactName());
+        info.setContactMobileMask(enterprise.getContactMobileMask());
+        info.setAuthStatus(enterprise.getAuthStatus());
+        return info;
+    }
+
+    private static MpUserInfoResponse.WorkerInfo toWorkerInfo(FeWorker worker) {
+        MpUserInfoResponse.WorkerInfo info = new MpUserInfoResponse.WorkerInfo();
+        info.setWorkerId(worker.getId());
+        info.setWorkerNo(worker.getWorkerNo());
+        info.setRealName(worker.getRealName());
+        info.setMobileMask(worker.getMobileMask());
+        info.setIdCardNoMask(worker.getIdCardNoMask());
+        info.setBankAccountMask(worker.getBankAccountMask());
+        info.setBankName(worker.getBankName());
+        info.setBankBranch(worker.getBankBranch());
+        info.setVerifyStatus(worker.getVerifyStatus());
+        return info;
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/auth/dto/MpUserInfoResponse.java

@@ -0,0 +1,248 @@
+package com.huimv.employment.service.auth.dto;
+
+/**
+ * 小程序当前用户信息，含登记状态及企业/临时工详情。
+ */
+public class MpUserInfoResponse {
+
+    /** 用户类型：enterprise / worker */
+    private String userType;
+
+    /** 是否已完成登记 */
+    private boolean registered;
+
+    /** 登录账号手机号脱敏 */
+    private String mobileMask;
+
+    private EnterpriseInfo enterprise;
+
+    private WorkerInfo worker;
+
+    public String getUserType() {
+        return userType;
+    }
+
+    public void setUserType(String userType) {
+        this.userType = userType;
+    }
+
+    public boolean isRegistered() {
+        return registered;
+    }
+
+    public void setRegistered(boolean registered) {
+        this.registered = registered;
+    }
+
+    public String getMobileMask() {
+        return mobileMask;
+    }
+
+    public void setMobileMask(String mobileMask) {
+        this.mobileMask = mobileMask;
+    }
+
+    public EnterpriseInfo getEnterprise() {
+        return enterprise;
+    }
+
+    public void setEnterprise(EnterpriseInfo enterprise) {
+        this.enterprise = enterprise;
+    }
+
+    public WorkerInfo getWorker() {
+        return worker;
+    }
+
+    public void setWorker(WorkerInfo worker) {
+        this.worker = worker;
+    }
+
+    /** 企业登记信息 */
+    public static class EnterpriseInfo {
+
+        private Long enterpriseId;
+
+        private String enterpriseCode;
+
+        private String name;
+
+        private String creditCode;
+
+        private String legalPerson;
+
+        private String registeredAddress;
+
+        private String contactName;
+
+        private String contactMobileMask;
+
+        private String authStatus;
+
+        public Long getEnterpriseId() {
+            return enterpriseId;
+        }
+
+        public void setEnterpriseId(Long enterpriseId) {
+            this.enterpriseId = enterpriseId;
+        }
+
+        public String getEnterpriseCode() {
+            return enterpriseCode;
+        }
+
+        public void setEnterpriseCode(String enterpriseCode) {
+            this.enterpriseCode = enterpriseCode;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getCreditCode() {
+            return creditCode;
+        }
+
+        public void setCreditCode(String creditCode) {
+            this.creditCode = creditCode;
+        }
+
+        public String getLegalPerson() {
+            return legalPerson;
+        }
+
+        public void setLegalPerson(String legalPerson) {
+            this.legalPerson = legalPerson;
+        }
+
+        public String getRegisteredAddress() {
+            return registeredAddress;
+        }
+
+        public void setRegisteredAddress(String registeredAddress) {
+            this.registeredAddress = registeredAddress;
+        }
+
+        public String getContactName() {
+            return contactName;
+        }
+
+        public void setContactName(String contactName) {
+            this.contactName = contactName;
+        }
+
+        public String getContactMobileMask() {
+            return contactMobileMask;
+        }
+
+        public void setContactMobileMask(String contactMobileMask) {
+            this.contactMobileMask = contactMobileMask;
+        }
+
+        public String getAuthStatus() {
+            return authStatus;
+        }
+
+        public void setAuthStatus(String authStatus) {
+            this.authStatus = authStatus;
+        }
+    }
+
+    /** 临时工登记信息 */
+    public static class WorkerInfo {
+
+        private Long workerId;
+
+        private String workerNo;
+
+        private String realName;
+
+        private String mobileMask;
+
+        private String idCardNoMask;
+
+        private String bankAccountMask;
+
+        private String bankName;
+
+        private String bankBranch;
+
+        private String verifyStatus;
+
+        public Long getWorkerId() {
+            return workerId;
+        }
+
+        public void setWorkerId(Long workerId) {
+            this.workerId = workerId;
+        }
+
+        public String getWorkerNo() {
+            return workerNo;
+        }
+
+        public void setWorkerNo(String workerNo) {
+            this.workerNo = workerNo;
+        }
+
+        public String getRealName() {
+            return realName;
+        }
+
+        public void setRealName(String realName) {
+            this.realName = realName;
+        }
+
+        public String getMobileMask() {
+            return mobileMask;
+        }
+
+        public void setMobileMask(String mobileMask) {
+            this.mobileMask = mobileMask;
+        }
+
+        public String getIdCardNoMask() {
+            return idCardNoMask;
+        }
+
+        public void setIdCardNoMask(String idCardNoMask) {
+            this.idCardNoMask = idCardNoMask;
+        }
+
+        public String getBankAccountMask() {
+            return bankAccountMask;
+        }
+
+        public void setBankAccountMask(String bankAccountMask) {
+            this.bankAccountMask = bankAccountMask;
+        }
+
+        public String getBankName() {
+            return bankName;
+        }
+
+        public void setBankName(String bankName) {
+            this.bankName = bankName;
+        }
+
+        public String getBankBranch() {
+            return bankBranch;
+        }
+
+        public void setBankBranch(String bankBranch) {
+            this.bankBranch = bankBranch;
+        }
+
+        public String getVerifyStatus() {
+            return verifyStatus;
+        }
+
+        public void setVerifyStatus(String verifyStatus) {
+            this.verifyStatus = verifyStatus;
+        }
+    }
+}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/enterprise/EnterpriseService.java

@@ -15,7 +15,6 @@ import com.huimv.employment.dao.mapper.FeUserMapper;
 import com.huimv.employment.service.config.SecurityProperties;
 import com.huimv.employment.service.enterprise.dto.EnterpriseRegisterRequest;
 import com.huimv.employment.service.enterprise.dto.EnterpriseRegisterResponse;
-import com.huimv.employment.service.enterprise.dto.EnterpriseStatusResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -46,29 +45,23 @@ public class EnterpriseService {
         this.securityProperties = securityProperties;
     }
 
-    public EnterpriseStatusResponse getStatus(Long userId) {
-        requireEnterpriseUser(userId);
-
+    public FeEnterprise findEnterpriseByUserId(Long userId) {
         FeEnterpriseUser binding = findBindingByUserId(userId);
-        EnterpriseStatusResponse response = new EnterpriseStatusResponse();
         if (binding == null) {
-            response.setRegistered(false);
-            return response;
+            return null;
         }
+        return feEnterpriseMapper.selectById(binding.getEnterpriseId());
+    }
 
-        FeEnterprise enterprise = feEnterpriseMapper.selectById(binding.getEnterpriseId());
-        if (enterprise == null) {
-            response.setRegistered(false);
-            return response;
+    public FeUser requireEnterpriseUser(Long userId) {
+        FeUser user = feUserMapper.selectById(userId);
+        if (user == null) {
+            throw new BizException(ErrorCode.UNAUTHORIZED);
         }
-
-        response.setRegistered(true);
-        response.setEnterpriseId(enterprise.getId());
-        response.setName(enterprise.getName());
-        response.setCreditCode(enterprise.getCreditCode());
-        response.setContactMobileMask(enterprise.getContactMobileMask());
-        response.setAuthStatus(enterprise.getAuthStatus());
-        return response;
+        if (!USER_TYPE_ENTERPRISE.equals(user.getUserType())) {
+            throw new BizException(ErrorCode.ENTERPRISE_ONLY);
+        }
+        return user;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -120,17 +113,6 @@ public class EnterpriseService {
         return toRegisterResponse(enterprise);
     }
 
-    private FeUser requireEnterpriseUser(Long userId) {
-        FeUser user = feUserMapper.selectById(userId);
-        if (user == null) {
-            throw new BizException(ErrorCode.UNAUTHORIZED);
-        }
-        if (!USER_TYPE_ENTERPRISE.equals(user.getUserType())) {
-            throw new BizException(ErrorCode.ENTERPRISE_ONLY);
-        }
-        return user;
-    }
-
     private FeEnterpriseUser findBindingByUserId(Long userId) {
         return feEnterpriseUserMapper.selectOne(new LambdaQueryWrapper<FeEnterpriseUser>()
                 .eq(FeEnterpriseUser::getUserId, userId)

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/enterprise/dto/EnterpriseStatusResponse.java

@@ -1,67 +0,0 @@
-package com.huimv.employment.service.enterprise.dto;
-
-/**
- * 企业登记状态，供前端判断是否跳转登记页。
- */
-public class EnterpriseStatusResponse {
-
-    private boolean registered;
-
-    private Long enterpriseId;
-
-    private String name;
-
-    private String creditCode;
-
-    private String contactMobileMask;
-
-    private String authStatus;
-
-    public boolean isRegistered() {
-        return registered;
-    }
-
-    public void setRegistered(boolean registered) {
-        this.registered = registered;
-    }
-
-    public Long getEnterpriseId() {
-        return enterpriseId;
-    }
-
-    public void setEnterpriseId(Long enterpriseId) {
-        this.enterpriseId = enterpriseId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCreditCode() {
-        return creditCode;
-    }
-
-    public void setCreditCode(String creditCode) {
-        this.creditCode = creditCode;
-    }
-
-    public String getContactMobileMask() {
-        return contactMobileMask;
-    }
-
-    public void setContactMobileMask(String contactMobileMask) {
-        this.contactMobileMask = contactMobileMask;
-    }
-
-    public String getAuthStatus() {
-        return authStatus;
-    }
-
-    public void setAuthStatus(String authStatus) {
-        this.authStatus = authStatus;
-    }
-}

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/worker/WorkerService.java

@@ -16,7 +16,6 @@ import com.huimv.employment.dao.mapper.FeWorkerMapper;
 import com.huimv.employment.service.config.SecurityProperties;
 import com.huimv.employment.service.worker.dto.WorkerRegisterRequest;
 import com.huimv.employment.service.worker.dto.WorkerRegisterResponse;
-import com.huimv.employment.service.worker.dto.WorkerStatusResponse;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -48,23 +47,21 @@ public class WorkerService {
         this.securityProperties = securityProperties;
     }
 
-    public WorkerStatusResponse getStatus(Long userId) {
-        FeUser user = requireWorkerUser(userId);
-        FeWorker worker = findWorkerByUserId(userId);
+    public FeWorker findWorkerByUserId(Long userId) {
+        return feWorkerMapper.selectOne(new LambdaQueryWrapper<FeWorker>()
+                .eq(FeWorker::getUserId, userId)
+                .last("LIMIT 1"));
+    }
 
-        WorkerStatusResponse response = new WorkerStatusResponse();
-        if (worker == null) {
-            response.setRegistered(false);
-            response.setMobileMask(user.getMobileMask());
-            return response;
+    public FeUser requireWorkerUser(Long userId) {
+        FeUser user = feUserMapper.selectById(userId);
+        if (user == null) {
+            throw new BizException(ErrorCode.UNAUTHORIZED);
         }
-
-        response.setRegistered(true);
-        response.setWorkerId(worker.getId());
-        response.setRealName(worker.getRealName());
-        response.setMobileMask(worker.getMobileMask());
-        response.setVerifyStatus(worker.getVerifyStatus());
-        return response;
+        if (!USER_TYPE_WORKER.equals(user.getUserType())) {
+            throw new BizException(ErrorCode.WORKER_ONLY);
+        }
+        return user;
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -115,23 +112,6 @@ public class WorkerService {
         return toRegisterResponse(worker);
     }
 
-    private FeUser requireWorkerUser(Long userId) {
-        FeUser user = feUserMapper.selectById(userId);
-        if (user == null) {
-            throw new BizException(ErrorCode.UNAUTHORIZED);
-        }
-        if (!USER_TYPE_WORKER.equals(user.getUserType())) {
-            throw new BizException(ErrorCode.WORKER_ONLY);
-        }
-        return user;
-    }
-
-    private FeWorker findWorkerByUserId(Long userId) {
-        return feWorkerMapper.selectOne(new LambdaQueryWrapper<FeWorker>()
-                .eq(FeWorker::getUserId, userId)
-                .last("LIMIT 1"));
-    }
-
     private void ensureIdCardNotUsed(String idCardNoEnc, Long currentUserId) {
         FeWorker existing = feWorkerMapper.selectOne(new LambdaQueryWrapper<FeWorker>()
                 .eq(FeWorker::getIdCardNoEnc, idCardNoEnc)

huimv-employment/fe-service/src/main/java/com/huimv/employment/service/worker/dto/WorkerStatusResponse.java

@@ -1,58 +0,0 @@
-package com.huimv.employment.service.worker.dto;
-
-/**
- * 临时工登记状态，供前端判断是否跳转登记页。
- */
-public class WorkerStatusResponse {
-
-    /** 是否已完成登记 */
-    private boolean registered;
-
-    private Long workerId;
-
-    private String realName;
-
-    private String mobileMask;
-
-    private String verifyStatus;
-
-    public boolean isRegistered() {
-        return registered;
-    }
-
-    public void setRegistered(boolean registered) {
-        this.registered = registered;
-    }
-
-    public Long getWorkerId() {
-        return workerId;
-    }
-
-    public void setWorkerId(Long workerId) {
-        this.workerId = workerId;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getMobileMask() {
-        return mobileMask;
-    }
-
-    public void setMobileMask(String mobileMask) {
-        this.mobileMask = mobileMask;
-    }
-
-    public String getVerifyStatus() {
-        return verifyStatus;
-    }
-
-    public void setVerifyStatus(String verifyStatus) {
-        this.verifyStatus = verifyStatus;
-    }
-}