|
|
|
@ -15,8 +15,8 @@ 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.*; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcLeaderGridResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; |
|
|
|
import com.elink.esua.epdc.dto.form.*; |
|
|
|
import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO; |
|
|
|
@ -108,23 +108,6 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
return this.userFeignClient.saveWxFormId(saveFormId); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据unionId登录 |
|
|
|
* |
|
|
|
* @param unionId |
|
|
|
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO> |
|
|
|
* @author work@yujt.net.cn |
|
|
|
* @date 2019/9/19 19:16 |
|
|
|
*/ |
|
|
|
private Result<EpdcAppAuthorizationDTO> getTokenByUnionId(String unionId) { |
|
|
|
// 查询当前微信是否已注册用户
|
|
|
|
Result<UserDTO> userInfoResult = userFeignClient.getUserForLoginByOpenId(unionId); |
|
|
|
if (!userInfoResult.success()) { |
|
|
|
return new Result().error(userInfoResult.getMsg()); |
|
|
|
} |
|
|
|
return this.getTokenByUserDto(userInfoResult.getData()); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 根据openId登录 |
|
|
|
* |
|
|
|
@ -297,6 +280,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
* @author work@yujt.net.cn |
|
|
|
* @date 2019/9/25 17:26 |
|
|
|
*/ |
|
|
|
@Deprecated |
|
|
|
private Result<EpdcAppRegisterCallbackDTO> getRegisterResult(UserDTO userDto) { |
|
|
|
Result result = userFeignClient.userRegist(userDto); |
|
|
|
EpdcAppRegisterCallbackDTO dto = new EpdcAppRegisterCallbackDTO(); |
|
|
|
@ -313,6 +297,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
* @author work@yujt.net.cn |
|
|
|
* @date 2019/9/20 14:40 |
|
|
|
*/ |
|
|
|
@Deprecated |
|
|
|
private void verifyUserRegisterData(EpdcUserRegistFormDTO formDto) { |
|
|
|
// 校验身份证号码格式
|
|
|
|
String verification = IdentityNoUtils.IdentityNoVerification(formDto.getIdentityNo()); |
|
|
|
@ -354,6 +339,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
* @author yujintao |
|
|
|
* @date 2019/9/10 21:09 |
|
|
|
*/ |
|
|
|
@Deprecated |
|
|
|
private UserDTO packageUserDto(EpdcUserRegistFormDTO formDto, WxMpUser wxMpUser, WxMaJscode2SessionResult wxMaUser) { |
|
|
|
String unionId = null; |
|
|
|
String openId = null; |
|
|
|
@ -542,7 +528,7 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Result<List<EpdcLeaderGridResultDTO>> listUserGrid(String userId) { |
|
|
|
public Result<List<EpdcUserGridResultDTO>> listUserGrid(String userId) { |
|
|
|
return userFeignClient.listUserGrid(userId); |
|
|
|
} |
|
|
|
|
|
|
|
@ -698,10 +684,11 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
if (!verifyResult.success()) { |
|
|
|
return new Result().error(verifyResult.getMsg()); |
|
|
|
} |
|
|
|
String userState = verifyResult.getData().toString(); |
|
|
|
|
|
|
|
UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(tokenDto.getGridId()); |
|
|
|
EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class); |
|
|
|
completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto); |
|
|
|
completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState); |
|
|
|
// 组装对象，准备保存用户信息
|
|
|
|
EpdcAppUserCompleteInfoFormDTO dto = new EpdcAppUserCompleteInfoFormDTO(); |
|
|
|
dto.setCompleteAppUser(completeAppUserDto); |
|
|
|
@ -733,7 +720,16 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
return new Result().error("获取用户信息失败"); |
|
|
|
} |
|
|
|
|
|
|
|
private EpdcCompleteAppUserDTO packageUserCompleteInfo(EpdcCompleteAppUserDTO dto) { |
|
|
|
/** |
|
|
|
* 组装个人完善信息对象 |
|
|
|
* |
|
|
|
* @param dto 已知数据 |
|
|
|
* @param userState 用户当前状态，用户状态不为0时，表明用户操作为二次修改 |
|
|
|
* @return com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO |
|
|
|
* @author work@yujt.net.cn |
|
|
|
* @date 2019/10/29 17:54 |
|
|
|
*/ |
|
|
|
private EpdcCompleteAppUserDTO packageUserCompleteInfo(EpdcCompleteAppUserDTO dto, String userState) { |
|
|
|
|
|
|
|
String road = dto.getRoad(); |
|
|
|
String villageName = dto.getVillageName(); |
|
|
|
@ -750,6 +746,10 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
} else { |
|
|
|
dto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); |
|
|
|
} |
|
|
|
// 用户不是第一次完善信息，保持现在的用户状态不变
|
|
|
|
if (!AppUserStatesEnum.STATE_REGISTERED.value().equals(userState)) { |
|
|
|
dto.setState(userState); |
|
|
|
} |
|
|
|
|
|
|
|
String address = road |
|
|
|
.concat(StringUtils.isNotBlank(villageName) ? villageName : "") |
|
|
|
@ -781,19 +781,11 @@ public class AppUserServiceImpl implements AppUserService { |
|
|
|
throw new RenException("查询网格信息失败"); |
|
|
|
} |
|
|
|
CompleteDeptDTO completeDept = adminDeptResult.getData(); |
|
|
|
UserGridRelationDTO gridRelationDTO = new UserGridRelationDTO(); |
|
|
|
gridRelationDTO.setDistrictId(completeDept.getDistrictId()); |
|
|
|
gridRelationDTO.setDistrict(completeDept.getDistrict()); |
|
|
|
gridRelationDTO.setStreet(completeDept.getStreet()); |
|
|
|
gridRelationDTO.setStreetId(completeDept.getStreetId()); |
|
|
|
gridRelationDTO.setCommunity(completeDept.getCommunity()); |
|
|
|
gridRelationDTO.setCommunityId(completeDept.getCommunityId()); |
|
|
|
gridRelationDTO.setGrid(completeDept.getGrid()); |
|
|
|
gridRelationDTO.setGridId(completeDept.getGridId()); |
|
|
|
gridRelationDTO.setSwitchedTime(new Date()); |
|
|
|
gridRelationDTO.setLeaderFlag(NumConstant.ZERO_STR); |
|
|
|
|
|
|
|
return gridRelationDTO; |
|
|
|
UserGridRelationDTO gridRelation = ConvertUtils.sourceToTarget(completeDept, UserGridRelationDTO.class); |
|
|
|
gridRelation.setSwitchedTime(new Date()); |
|
|
|
gridRelation.setLeaderFlag(YesOrNoEnum.NO.value()); |
|
|
|
|
|
|
|
return gridRelation; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|
yujintao
6 years ago