Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ContractServiceImpl.java

@@ -163,7 +163,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(organCode);
 
 			if (sysUserTsign == null) {
-
 				String accountId = eSealPlugin.createOrganAccount(orgName, organCode);
 
 				if (StringUtils.isBlank(accountId)) {
@@ -179,7 +178,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 				sysUserTsign = new SysUserTsign(-1, accountId, sealData, orgName, organCode);
 
 				sysUserTsignService.insert(sysUserTsign);
-
 			}
 		}
 	}
@@ -194,20 +192,30 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 		if (sysUserTsign == null) {
 
-			if(!debugMode){
-				realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
+			String accountId = "";
+			String sealData = "";
+
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if (user == null) {
+				throw new BizException("用户信息查询失败");
 			}
 
-			String accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
+			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())){
+				if(!debugMode){
+					realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
+				}
 
-			if (StringUtils.isBlank(accountId)) {
-				throw new BizException("创建电子存证账户失败");
-			}
+				accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
+
+				if (StringUtils.isBlank(accountId)) {
+					throw new BizException("创建电子存证账户失败");
+				}
 
-			String sealData = eSealPlugin.createUserSeal(accountId);
+				sealData = eSealPlugin.createUserSeal(accountId);
 
-			if (StringUtils.isBlank(sealData)) {
-				throw new BizException("创建电子存证印章失败");
+				if (StringUtils.isBlank(sealData)) {
+					throw new BizException("创建电子存证印章失败");
+				}
 			}
 
 			sysUserTsign = new SysUserTsign(userId, accountId, sealData, realName, idCardNo);
@@ -230,8 +238,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
-				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 
 		// 合成freemarker
@@ -325,8 +332,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
-				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 		Date date = new Date();
 
@@ -522,8 +528,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
-				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 		Date date = new Date();
 
@@ -666,8 +671,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
-				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 		Date date = new Date();
 
@@ -902,8 +906,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			if (user == null) {
 				throw new BizException("用户信息查询失败");
 			}
-			if(CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType()))
-				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
 
 		Date date = new Date();
@@ -985,7 +988,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		}
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
-		if (sysUserTsign == null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
+		if (sysUserTsign == null) {
 			try {
 				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 			} catch (Exception e) {
@@ -1172,7 +1175,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		}
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
-		if (sysUserTsign == null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
+		if (sysUserTsign == null) {
 			try {
 				sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 			} catch (Exception e) {

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -1485,9 +1485,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentInfo.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(studentInfo);
         // 添加用户电子签章账户
-        if (CertificateTypeEnum.IDENTITY.getCode().equals(studentRegistration.getCertificateType())) {
-            contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());
-        }
+        contractService.register(student.getUserId(), student.getParentsName(), student.getIdCardNo(), student.getParentsPhone());
         return student;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1637,7 +1637,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				}
 			}
 		}
-		if(!"36".equals(user.getOrganId())&& CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())){
+		if(!"36".equals(user.getOrganId())){
 			try {
 				contractService.register(user.getId(),user.getRealName(),user.getIdCardNo(),user.getPhone());
 			} catch (Exception e) {