重命名文件

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

@@ -11,7 +11,7 @@ import java.io.Serializable;
  * @date 19/9/25 17:21
  */
 @Data
-public class EpdcAfterRegisterResultDTO implements Serializable {
+public class EpdcAppRegisterCallbackDTO 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

@@ -12,7 +12,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,7 +55,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/mp/regist")
-    public Result<EpdcAfterRegisterResultDTO> mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAppRegisterCallbackDTO> mpUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.mpUserRegist(formDto);
     }
@@ -69,7 +69,7 @@ public class ApiAppUserController {
      * @date 2019/9/9 10:41
      */
     @PostMapping("user/ma/regist")
-    public Result<EpdcAfterRegisterResultDTO> maUserRegist(@RequestBody EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAppRegisterCallbackDTO> 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

@@ -10,7 +10,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 
 /**
@@ -28,7 +28,7 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/7 09:54
      */
-    Result<EpdcAfterRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcAppRegisterCallbackDTO> mpUserRegist(EpdcUserRegistFormDTO formDto);
 
     /**
      * 公众号用户登录，获取token
@@ -92,7 +92,7 @@ public interface AppUserService {
      * @author yujintao
      * @date 2019/9/10 20:48
      */
-    Result<EpdcAfterRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto);
+    Result<EpdcAppRegisterCallbackDTO> maUserRegist(EpdcUserRegistFormDTO formDto);
 
     /**
      * 用户查询注册结果

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

@@ -21,7 +21,7 @@ import com.elink.esua.epdc.dto.form.EpdcAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppUserTokenFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppSaveWxFormIdFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcCheckRegisterFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
 import com.elink.esua.epdc.enums.AppUserRegisterSourceEnum;
@@ -206,7 +206,7 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<EpdcAfterRegisterResultDTO> maUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAppRegisterCallbackDTO> maUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -221,7 +221,7 @@ public class AppUserServiceImpl implements AppUserService {
 
 
     @Override
-    public Result<EpdcAfterRegisterResultDTO> mpUserRegist(EpdcUserRegistFormDTO formDto) {
+    public Result<EpdcAppRegisterCallbackDTO> mpUserRegist(EpdcUserRegistFormDTO formDto) {
 
         this.verifyUserRegisterData(formDto);
 
@@ -238,13 +238,13 @@ public class AppUserServiceImpl implements AppUserService {
      * 用户注册并组装返回数据
      *
      * @param userDto
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAfterRegisterResultDTO>
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO>
      * @author work@yujt.net.cn
      * @date 2019/9/25 17:26
      */
-    private Result<EpdcAfterRegisterResultDTO> getRegisterResult(UserDTO userDto) {
+    private Result<EpdcAppRegisterCallbackDTO> getRegisterResult(UserDTO userDto) {
         Result result = userFeignClient.userRegist(userDto);
-        EpdcAfterRegisterResultDTO dto = new EpdcAfterRegisterResultDTO();
+        EpdcAppRegisterCallbackDTO dto = new EpdcAppRegisterCallbackDTO();
         dto.setOpenId(userDto.getWxOpenId());
         result.setData(dto);
         return result;