用户完善信息时，调整验证信息的顺序；修改完善信息时党员手机号和党员比对失败时的提示

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

@@ -766,39 +766,27 @@ public class AppUserServiceImpl implements AppUserService {
     @Override
     public Result<EpdcAppAuthorizationDTO> completeUserInfo(TokenDto tokenDto, EpdcCompleteUserInfoFormDTO infoDto) {
 
+        // 验证手机号
+        this.checkSmsCode(infoDto.getMobile(), infoDto.getSmsCode());
+
         UserDTO userDto = ConvertUtils.sourceToTarget(infoDto, UserDTO.class);
-        // 姓名身份证号去除特殊字符
         userDto.setRealName(ModuleUtils.replaceIllegalCharacter(infoDto.getRealName()));
-        userDto.setIdentityNo(ModuleUtils.replaceIllegalCharacter(infoDto.getIdentityNo()));
-
-        userDto.setDeptId(Long.valueOf(infoDto.getGridId()));
+        userDto.setDeptId(infoDto.getGridId());
         userDto.setId(tokenDto.getUserId());
 
-        if (StringUtils.isNotBlank(infoDto.getWxCode())) {
-            String sessionKey = this.getUserSessionKey(infoDto.getWxCode());
-            WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv());
-            if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
-                return new Result().error("解析微信开放平台ID失败");
-            }
-            userDto.setWxUnionId(wxMaUserInfo.getUnionId());
-        }
-
         // 党员提交，验证身份证号
+        String identityNo = ModuleUtils.replaceIllegalCharacter(infoDto.getIdentityNo());
         if (YesOrNoEnum.YES.value().equals(userDto.getPartyFlag())) {
-            String identityNo = userDto.getIdentityNo();
             if (StringUtils.isBlank(identityNo)) {
                 return new Result().error("身份证号不能为空");
-            } else {
-                String verification = IdentityNoUtils.IdentityNoVerification(identityNo);
-                if (StringUtils.isNotBlank(verification)) {
-                    return new Result().error(verification);
-                }
             }
-        } else {
-            userDto.setIdentityNo(null);
+            String verification = IdentityNoUtils.IdentityNoVerification(identityNo);
+            if (StringUtils.isNotBlank(verification)) {
+                return new Result().error(verification);
+            }
+            userDto.setIdentityNo(identityNo);
         }
-        // 验证手机号
-        this.checkSmsCode(userDto.getMobile(), infoDto.getSmsCode());
+
         // 验证用户提交的信息
         Result<String> verifyResult = userFeignClient.verifyUserCompleteData(userDto);
         if (!verifyResult.success()) {
@@ -806,6 +794,15 @@ public class AppUserServiceImpl implements AppUserService {
         }
         String userState = verifyResult.getData();
 
+        if (StringUtils.isNotBlank(infoDto.getWxCode())) {
+            String sessionKey = this.getUserSessionKey(infoDto.getWxCode());
+            WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.normalWxMaService().getUserService().getUserInfo(sessionKey, infoDto.getEncryptedData(), infoDto.getIv());
+            if (StringUtils.isBlank(wxMaUserInfo.getUnionId())) {
+                return new Result().error("解析微信开放平台ID失败");
+            }
+            userDto.setWxUnionId(wxMaUserInfo.getUnionId());
+        }
+
         UserGridRelationDTO userGrid = this.packageUserGridRelationInfo(infoDto.getGridId());
         EpdcCompleteAppUserDTO completeAppUserDto = ConvertUtils.sourceToTarget(userDto, EpdcCompleteAppUserDTO.class);
         completeAppUserDto = this.packageUserCompleteInfo(completeAppUserDto, userState);
@@ -844,7 +841,6 @@ public class AppUserServiceImpl implements AppUserService {
             formDto.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
 
             groupFeignClient.updateUserPartyMember(formDto);
-//            groupTask.updateUserPartyMember(formDto);
         }
 
         return new Result().ok(authorizationDto);

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -618,6 +618,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             partyMembersEntity.setGridId(userGridRelation.getGridId());
             partyMembersEntity.setGridName(userGridRelation.getGrid());
             partyMembersEntity.setRegistFlag(PartyMemberRegFlagEnum.AUTO.getValue());
+            partyMembersEntity.setMobile(userDto.getMobile());
             partyMembersEntity.setRegistTime(oldEntity.getRegisterTime());
             QueryWrapper<PartyMembersEntity> partyWrapper = new QueryWrapper<>();
             partyWrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo)

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties

@@ -1,2 +1,3 @@
 #Default
-100006001=\u5728\u515A\u5458\u5E93\u4E2D\u6CA1\u6709\u627E\u5230\u60A8\u7684\u4FE1\u606F\uFF0C\u6211\u4EEC\u5148\u5C06\u60A8\u8BA4\u8BC1\u4E3A\u5C45\u6C11\uFF0C\u8BF7\u8054\u7CFB\u5F53\u5730\u7BA1\u7406\u4EBA\u5458\u5B8C\u5584\u515A\u5458\u5E93\u540E\u7EE7\u7EED\u8BA4\u8BC1
+#100006001=\u5728\u515A\u5458\u5E93\u4E2D\u6CA1\u6709\u627E\u5230\u60A8\u7684\u4FE1\u606F\uFF0C\u6211\u4EEC\u5148\u5C06\u60A8\u8BA4\u8BC1\u4E3A\u5C45\u6C11\uFF0C\u8BF7\u8054\u7CFB\u5F53\u5730\u7BA1\u7406\u4EBA\u5458\u5B8C\u5584\u515A\u5458\u5E93\u540E\u7EE7\u7EED\u8BA4\u8BC1
+100006001=\u6211\u4EEC\u6536\u5230\u60A8\u7684\u8BA4\u8BC1\u4FE1\u606F\uFF0C\u4F1A\u5C3D\u5FEB\u5BA1\u6838\uFF0C\u60A8\u53EF\u4EE5\u4EAB\u53D7\u5E73\u53F0\u7684\u670D\u52A1\u4E86