添加用户查询注册结果接口

esua-epdc/epdc-gateway/src/main/resources/application.yml

@@ -194,6 +194,7 @@ epdc:
     - /api/wx/getWxConfig  # 获取微信公众号配置
     - /api/admin/dept/completeName # 获取完整部门名称
     - /api/message/sms/sendCode # 发送短信验证码
+    - /api/message/sms/registerResult # 发送用户注册审核结果
     - /api/events/issue/upload # 上传图片
     - /api/app-user/user/mp/regist # 公众号用户注册
     - /api/app-user/user/ma/regist # 小程序用户注册

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCheckRegisterFormDTO.java

@@ -0,0 +1,21 @@
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * 用户查询注册结果
+ *
+ * @author work@yujt.net.cn
+ * @date 19/09/26 9:09
+ */
+@Data
+public class EpdcCheckRegisterFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1067656176645275731L;
+
+    @NotBlank(message = "微信openId不能为空")
+    private String openId;
+}

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcRegisterResultDTO.java → esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAfterRegisterResultDTO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 19/9/25 17:21
  */
 @Data
-public class EpdcRegisterResultDTO implements Serializable {
+public class EpdcAfterRegisterResultDTO implements Serializable {
 
     private static final long serialVersionUID = 3032347110979742552L;
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -10,8 +10,9 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
-import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -39,7 +40,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/mp/regist")
-    public Result<EpdcRegisterResultDTO> mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAfterRegisterResultDTO> mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.mpUserRegist(formDto);
     }
@@ -53,11 +54,25 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/ma/regist")
-    public Result<EpdcRegisterResultDTO> maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAfterRegisterResultDTO> maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.maUserRegist(formDto);
     }
 
+    /**
+     * 用户查询注册结果
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/26 09:14
+     */
+    @GetMapping("user/checkRegister")
+    public Result<EpdcAppAuthorizationDTO> checkRegister(EpdcCheckRegisterFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.checkRegister(formDto);
+    }
+
     /**
      * 公众号用户登录，获取token
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -8,8 +8,9 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
-import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 
 /**
  * @author yujintao
@@ -26,7 +27,7 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/7 09:54
      */
-    Result<EpdcRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcAfterRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto);
 
     /**
      * 公众号用户登录，获取token
@@ -90,5 +91,15 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/10 20:48
      */
-    Result<EpdcRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcAfterRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto);
+
+    /**
+     * 用户查询注册结果
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/26 09:14
+     */
+    Result<EpdcAppAuthorizationDTO> checkRegister(EpdcCheckRegisterFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -18,8 +18,9 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcUserUpdateMobileFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
-import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterWayEnum;
@@ -93,6 +94,11 @@ public class AppUserServiceImpl implements AppUserService {
         return this.getTokenByOpenId(this.getWxMaUser(formDto.getWxCode()).getOpenid());
     }
 
+    @Override
+    public Result<EpdcAppAuthorizationDTO> checkRegister(EpdcCheckRegisterFormDTO formDto) {
+        return this.getTokenByOpenId(formDto.getOpenId());
+    }
+
     /**
      * 根据unionId登录
      *
@@ -188,7 +194,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<EpdcRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAfterRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -203,7 +209,7 @@ public class AppUserServiceImpl implements AppUserService {
 
 
     @Override
-    public Result<EpdcRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAfterRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -220,13 +226,13 @@ public class AppUserServiceImpl implements AppUserService {
      * 用户注册并组装返回数据
      *
      * @param userDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/25 17:26
      */
-    private Result<EpdcRegisterResultDTO> getRegisterResult(UserDTO userDto) {
+    private Result<EpdcAfterRegisterResultDTO> getRegisterResult(UserDTO userDto) {
         Result result = userFeignClient.userRegist(userDto);
-        EpdcRegisterResultDTO dto = new EpdcRegisterResultDTO();
+        EpdcAfterRegisterResultDTO dto = new EpdcAfterRegisterResultDTO();
         dto.setOpenId(userDto.getWxOpenId());
         result.setData(dto);
         return result;