From ab0e8e6d77302b32cd5526caf160a80d6bfa0066 Mon Sep 17 00:00:00 2001 From: yujintao Date: Tue, 29 Oct 2019 13:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=9A=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 17 ++-- .../esua/epdc/feign/UserFeignClient.java | 8 +- .../fallback/UserFeignClientFallback.java | 8 +- .../esua/epdc/service/AppUserService.java | 8 +- .../epdc/service/impl/AppUserServiceImpl.java | 61 ++++++------ .../epdc/dto/epdc/EpdcCompleteAppUserDTO.java | 97 +++++++++++++++++++ .../form/EpdcAppUserCompleteInfoFormDTO.java | 4 +- .../epdc/result/EpdcLeaderGridResultDTO.java | 2 +- .../EpdcUserGridRelationController.java | 10 +- .../epdc/service/UserGridRelationService.java | 4 +- .../impl/UserGridRelationServiceImpl.java | 4 +- .../epdc/service/impl/UserServiceImpl.java | 21 +--- 12 files changed, 166 insertions(+), 78 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 8f604f113..fb5b3a41f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -158,7 +158,7 @@ public class ApiAppUserController { } /** - * 网格长在小程序切换网格 + * 用户小程序切换网格 * * @param userDetail * @param gridId @@ -167,29 +167,28 @@ public class ApiAppUserController { * @date 2019/10/23 10:38 */ @GetMapping("user/switchGrid/{gridId}") - public Result gridLeaderSwitchGrid(@LoginUser TokenDto userDetail, @PathVariable("gridId") String gridId) { - return appUserService.gridLeaderSwitchGrid(userDetail, gridId); + public Result userSwitchGrid(@LoginUser TokenDto userDetail, @PathVariable("gridId") String gridId) { + return appUserService.userSwitchGrid(userDetail, gridId); } /** - * 获取网格长管理的所有网格 + * 获取用户的所有网格列表 * * @param userDetail * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author work@yujt.net.cn * @date 2019/10/23 15:58 */ - @GetMapping("user/listGridForLeader") - public Result> listGridForLeader(@LoginUser TokenDto userDetail) { - return appUserService.listGridForLeader(userDetail.getUserId()); + @GetMapping("user/listGrid") + public Result> listUserGrid(@LoginUser TokenDto userDetail) { + return appUserService.listUserGrid(userDetail.getUserId()); } /** - * * 更新用户微信信息 * - * @params [tokenDto, formDto] * @return com.elink.esua.epdc.commons.tools.utils.Result + * @params [tokenDto, formDto] * @author liuchuang * @since 2019/10/28 9:58 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index d7b619930..2d22adb53 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -203,8 +203,8 @@ public interface UserFeignClient { * @author work@yujt.net.cn * @date 2019/10/23 13:33 */ - @GetMapping(value = "app-user/epdc-app/usergrid/leaderSwitchGrid", consumes = MediaType.APPLICATION_JSON_VALUE) - Result leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto); + @GetMapping(value = "app-user/epdc-app/usergrid/userSwitchGrid", consumes = MediaType.APPLICATION_JSON_VALUE) + Result userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto); /** * 获取网格长管理的网格列表 @@ -214,8 +214,8 @@ public interface UserFeignClient { * @author work@yujt.net.cn * @date 2019/10/23 13:34 */ - @GetMapping("app-user/epdc-app/usergrid/listGridForLeader/{userId}") - Result> listGridForLeader(@PathVariable("userId") String userId); + @GetMapping("app-user/epdc-app/usergrid/listUserGrid/{userId}") + Result> listUserGrid(@PathVariable("userId") String userId); /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 195d13f26..6a3d652fd 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -97,13 +97,13 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "leaderSwitchGrid", switchGridDto); + public Result userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "userSwitchGrid", switchGridDto); } @Override - public Result> listGridForLeader(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listGridForLeader", userId); + public Result> listUserGrid(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listUserGrid", userId); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index f395812c1..f7b51d51a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -124,7 +124,7 @@ public interface AppUserService { Result maGridLeaderRegister(EpdcGridLeaderRegisterSubmitFormDTO formDto); /** - * 网格长在小程序切换网格 + * 用户小程序切换网格 * * @param userDetail * @param gridId @@ -132,17 +132,17 @@ public interface AppUserService { * @author work@yujt.net.cn * @date 2019/10/23 10:40 */ - Result gridLeaderSwitchGrid(TokenDto userDetail, String gridId); + Result userSwitchGrid(TokenDto userDetail, String gridId); /** - * 获取网格长管理的所有网格 + * 获取用户的所有网格列表 * * @param userId * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author work@yujt.net.cn * @date 2019/10/23 15:58 */ - Result> listGridForLeader(String userId); + Result> listUserGrid(String userId); /** * 用户注册、获取Token diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 210a7ebe6..2f3ade91b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -11,6 +11,7 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; @@ -253,7 +254,6 @@ public class AppUserServiceImpl implements AppUserService { appUser.setLastLoginTime(now); appUser.setRegisterTime(now); appUser.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); - appUser.setGridId(NumConstant.ZERO_L); appUser.setRegisterSource(AppUserRegisterSourceEnum.MA.value()); appUser.setRegisterWay(AppUserRegisterWayEnum.WX.value()); appUser.setMobile(mobile); @@ -521,7 +521,7 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result gridLeaderSwitchGrid(TokenDto userDetail, String gridId) { + public Result userSwitchGrid(TokenDto userDetail, String gridId) { String userId = userDetail.getUserId(); @@ -529,7 +529,7 @@ public class AppUserServiceImpl implements AppUserService { switchGrid.setAppUserId(userId); switchGrid.setGridId(gridId); // 更新用户-网格关系表，更新将要切换的网格的 SWITCHED_TIME 字段 - Result appUserResult = userFeignClient.leaderSwitchGrid(switchGrid); + Result appUserResult = userFeignClient.userSwitchGrid(switchGrid); if (!appUserResult.success()) { return new Result().error(appUserResult.getMsg()); } @@ -542,8 +542,8 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result> listGridForLeader(String userId) { - return userFeignClient.listGridForLeader(userId); + public Result> listUserGrid(String userId) { + return userFeignClient.listUserGrid(userId); } /** @@ -677,6 +677,7 @@ public class AppUserServiceImpl implements AppUserService { public Result completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) { UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class); + userDto.setId(tokenDto.getUserId()); // 党员提交，验证身份证号 if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { @@ -692,22 +693,18 @@ public class AppUserServiceImpl implements AppUserService { } // 验证手机号 this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode()); - - - userDto.setId(tokenDto.getUserId()); // 验证用户提交的信息 Result verifyResult = userFeignClient.verifyUserCompleteData(userDto); if (!verifyResult.success()) { return new Result().error(verifyResult.getMsg()); } + UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId()); + EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class); + completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto); // 组装对象，准备保存用户信息 EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO(); - - UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId()); - userDto = this.packageUserCompleteInfo(userDto); - - dto.setUserDto(userDto); + dto.setCompleteAppUser(completeAppUserDto); dto.setUserGridRelation(userGrid); Result completeResult = userFeignClient.completeUserInfo(dto); @@ -736,27 +733,37 @@ public class AppUserServiceImpl implements AppUserService { return new Result().error("获取用户信息失败"); } - private UserDTO packageUserCompleteInfo(UserDTO userDto) { + private EpdcCompleteAppUserDTO packageUserCompleteInfo(EpdcCompleteAppUserDTO dto) { - if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) { - userDto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); - userDto.setSex(IdentityNoUtils.getSex(userDto.getIdentityNo())); - userDto.setNickname( - userDto.getRoad().concat("-").concat(userDto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE)) - .concat(NumConstant.ZERO_STR.equals(userDto.getSex()) ? "女士" : "先生")); - userDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(userDto.getIdentityNo()), DateUtils.DATE_PATTERN)); + String road = dto.getRoad(); + String villageName = dto.getVillageName(); + String dwellingPlace = dto.getDwellingPlace(); + String identityNo = dto.getIdentityNo(); + + if (YesOrNoEnum.YES.value().equals(dto.getPartyFlag())) { + dto.setState(AppUserStatesEnum.STATE_INFORMATION_PASSED.value()); + dto.setSex(IdentityNoUtils.getSex(identityNo)); + dto.setNickname( + road.concat("-").concat(dto.getRealName().substring(NumConstant.ZERO, NumConstant.ONE)) + .concat(NumConstant.ZERO_STR.equals(dto.getSex()) ? "女士" : "先生")); + dto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN)); } else { - userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); + dto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); } - PhoneDto phoneDto = PhoneUtil.getPhoneDto(userDto.getMobile()); + String address = road + .concat(StringUtils.isNotBlank(villageName) ? villageName : "") + .concat(StringUtils.isNotBlank(dwellingPlace) ? dwellingPlace : ""); + dto.setAddress(address); + + PhoneDto phoneDto = PhoneUtil.getPhoneDto(dto.getMobile()); if (phoneDto != null) { - userDto.setMobileCarrier(phoneDto.getCarrier()); - userDto.setMobileCity(phoneDto.getCityName()); - userDto.setMobileProvince(phoneDto.getProvinceName()); + dto.setMobileCarrier(phoneDto.getCarrier()); + dto.setMobileCity(phoneDto.getCityName()); + dto.setMobileProvince(phoneDto.getProvinceName()); } - return userDto; + return dto; } /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java new file mode 100644 index 000000000..fa7b52f85 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/EpdcCompleteAppUserDTO.java @@ -0,0 +1,97 @@ +package com.elink.esua.epdc.dto.epdc; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 完善个人信息，传送数据到user模块 + * + * @author work@yujt.net.cn + * @date 2019/10/29 09:15 + */ +@Data +public class EpdcCompleteAppUserDTO implements Serializable { + + + private static final long serialVersionUID = -8356026348661169354L; + + /** + * 主键 + */ + private String id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别(女性-0，男性-1) + */ + private String sex; + + /** + * 生日 + */ + private Date birthday; + + /** + * 真实姓名 + */ + private String realName; + + /** + * 身份证号 + */ + private String identityNo; + + /** + * 所在道路（如山东路168号） + */ + private String road; + + private String address; + + /** + * 小区名称 + */ + private String villageName; + + /** + * 住处（楼栋-单元-房间） + */ + private String dwellingPlace; + + /** + * 是否是党员(0-否，1-是) + */ + private String partyFlag; + + /** + * 手机号所属省份 + */ + private String mobileProvince; + + /** + * 手机号所属城市 + */ + private String mobileCity; + + /** + * 手机号所属运营商 + */ + private String mobileCarrier; + + /** + * 状态(0-未审核，1-审核通过，2-审核未通过) + */ + private String state; + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java index 2db9f93e6..b48d7e95c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppUserCompleteInfoFormDTO.java @@ -1,7 +1,7 @@ package com.elink.esua.epdc.dto.epdc.form; -import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; +import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import lombok.Data; import java.io.Serializable; @@ -17,7 +17,7 @@ public class EpdcAppUserCompleteInfoFormDTO implements Serializable { private static final long serialVersionUID = 6891651684067520384L; - private UserDTO userDto; + private EpdcCompleteAppUserDTO completeAppUser; private UserGridRelationDTO userGridRelation; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java index 74e174774..23f579749 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcLeaderGridResultDTO.java @@ -17,5 +17,5 @@ public class EpdcLeaderGridResultDTO implements Serializable { private String grid; - private String gridId; + private Long gridId; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java index 37c85e50d..e43747731 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcUserGridRelationController.java @@ -50,9 +50,9 @@ public class EpdcUserGridRelationController { * @author work@yujt.net.cn * @date 2019/10/23 11:04 */ - @GetMapping("leaderSwitchGrid") - public Result leaderSwitchGrid(@RequestBody EpdcLeaderSwitchGridFormDTO switchGridDto) { - return userGridRelationService.leaderSwitchGrid(switchGridDto); + @GetMapping("userSwitchGrid") + public Result userSwitchGrid(@RequestBody EpdcLeaderSwitchGridFormDTO switchGridDto) { + return userGridRelationService.userSwitchGrid(switchGridDto); } /** @@ -63,8 +63,8 @@ public class EpdcUserGridRelationController { * @author work@yujt.net.cn * @date 2019/10/23 13:26 */ - @GetMapping("listGridForLeader/{userId}") + @GetMapping("listUserGrid/{userId}") public Result> listGridForLeader(@PathVariable("userId") String userId) { - return userGridRelationService.listGridForLeader(userId); + return userGridRelationService.listUserGridForApi(userId); } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java index 46245fd9f..5442ea565 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java @@ -104,7 +104,7 @@ public interface UserGridRelationService extends BaseService leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto); + Result userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto); /** * 获取网格长管理的网格列表 @@ -114,7 +114,7 @@ public interface UserGridRelationService extends BaseService> listGridForLeader(String userId); + Result> listUserGridForApi(String userId); /** * 获取用户绑定网格信息 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java index 6440119ad..dc3a16724 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java @@ -103,7 +103,7 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl leaderSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) { + public Result userSwitchGrid(EpdcLeaderSwitchGridFormDTO switchGridDto) { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq(UserFieldConsant.USER_ID, switchGridDto.getAppUserId()) @@ -127,7 +127,7 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl> listGridForLeader(String userId) { + public Result> listUserGridForApi(String userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(UserFieldConsant.USER_ID, userId) .orderByDesc(UserFieldConsant.SWITCHED_TIME); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 740d8f4a4..41df07ced 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -37,6 +37,7 @@ import com.elink.esua.epdc.dao.PartyMembersDao; import com.elink.esua.epdc.dao.UserDao; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; +import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; @@ -400,25 +401,9 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public Result completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { - UserDTO formUser = formDto.getUserDto(); - UserDTO userDto = new UserDTO(); - - userDto.setPartyFlag(formUser.getPartyFlag()); - userDto.setMobile(formUser.getMobile()); - userDto.setMobileCarrier(formUser.getMobileCarrier()); - userDto.setMobileCity(formUser.getMobileCity()); - userDto.setMobileProvince(formUser.getMobileProvince()); - - userDto.setRealName(formUser.getRealName()); - userDto.setNickname(formUser.getNickname()); - userDto.setState(formUser.getState()); - userDto.setSex(formUser.getSex()); - userDto.setIdentityNo(formUser.getIdentityNo()); - - userDto.setRoad(formUser.getRoad()); - userDto.setVillageName(formUser.getVillageName()); - userDto.setDwellingPlace(formUser.getDwellingPlace()); + EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); + UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser,UserDTO.class); UserGridRelationDTO userGridRelation = formDto.getUserGridRelation(); if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {