Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/ContractService.java

@@ -1,5 +1,7 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.entity.SysUserTsign;
+
 public interface ContractService {
 
 	/**
@@ -7,7 +9,7 @@ public interface ContractService {
 	 * @param userId
 	 * @return
 	 */
-	boolean register(Integer userId);
+	SysUserTsign register(Integer userId);
 
 	/**
 	 * 传递注册协议至第三方公证平台

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

@@ -87,7 +87,7 @@ public class ContractServiceImpl implements ContractService {
 	private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
 	@Override
-	public boolean register(Integer userId) {
+	public SysUserTsign register(Integer userId) {
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
@@ -95,7 +95,7 @@ public class ContractServiceImpl implements ContractService {
 
 			SysUser user = sysUserFeignService.queryUserById(userId);
 			if (user == null) {
-				return false;
+				return null;
 			}
 			String accountId = eSealPlugin.createUserAccount(user.getRealName(), user.getIdCardNo(), user.getPhone());
 
@@ -112,9 +112,11 @@ public class ContractServiceImpl implements ContractService {
 			sysUserTsign = new SysUserTsign(userId, accountId, sealData);
 
 			sysUserTsignService.insert(sysUserTsign);
+			
+			return sysUserTsign;
 		}
 
-		return true;
+		return null;
 	}
 
 	@Override
@@ -123,7 +125,7 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			return false;
+			sysUserTsign = register(userId);
 		}
 
 		// 合成freemarker
@@ -207,7 +209,7 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			return false;
+			sysUserTsign = register(userId);
 		}
 
 		// 合成freemarker
@@ -346,7 +348,7 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			return false;
+			sysUserTsign = register(userId);
 		}
 
 		// 合成freemarker
@@ -463,7 +465,7 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			return false;
+			sysUserTsign = register(userId);
 		}
 
 		// 合成freemarker