用户注册成功后将openId返回前端

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

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 用户注册后返回前端的数据
+ *
+ * @author work@yujt.net.cn
+ * @date 19/9/25 17:21
+ */
+@Data
+public class EpdcRegisterResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3032347110979742552L;
+
+    /**
+     * 微信openId
+     */
+    private String openId;
+}

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

@@ -11,6 +11,7 @@ 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.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.*;
@@ -38,7 +39,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/mp/regist")
-    public Result mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.mpUserRegist(formDto);
     }
@@ -52,7 +53,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/ma/regist")
-    public Result maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.maUserRegist(formDto);
     }

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

@@ -9,6 +9,7 @@ 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.result.EpdcAppAuthorizationDTO;
+import com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO;
 
 /**
  * @author yujintao
@@ -25,7 +26,7 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/7 09:54
      */
-    Result mpUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto);
 
     /**
      * 公众号用户登录，获取token
@@ -89,5 +90,5 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/10 20:48
      */
-    Result maUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto);
 }

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

@@ -19,6 +19,7 @@ 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.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;
@@ -187,7 +188,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result maUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -197,12 +198,12 @@ public class AppUserServiceImpl implements AppUserService {
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         userDto.setLastLoginIp(IpUtils.getIpAddr(request));
 
-        return userFeignClient.userRegist(userDto);
+        return getRegisterResult(userDto);
     }
 
 
     @Override
-    public Result mpUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -212,7 +213,23 @@ public class AppUserServiceImpl implements AppUserService {
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         userDto.setLastLoginIp(IpUtils.getIpAddr(request));
 
-        return userFeignClient.userRegist(userDto);
+        return getRegisterResult(userDto);
+    }
+
+    /**
+     * 用户注册并组装返回数据
+     *
+     * @param userDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcRegisterResultDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/9/25 17:26
+     */
+    private Result<EpdcRegisterResultDTO> getRegisterResult(UserDTO userDto) {
+        Result result = userFeignClient.userRegist(userDto);
+        EpdcRegisterResultDTO dto = new EpdcRegisterResultDTO();
+        dto.setOpenId(userDto.getWxOpenId());
+        result.setData(dto);
+        return result;
     }
 
     /**