update

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

@@ -7,9 +7,12 @@ public interface ContractService {
 	/**
 	 * 用户注册
 	 * @param userId
+	 * @param realName
+	 * @param idCardNo
+	 * @param mobileNo
 	 * @return
 	 */
-	SysUserTsign register(Integer userId);
+	SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo);
 
 	/**
 	 * 传递注册协议至第三方公证平台

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

@@ -87,17 +87,13 @@ public class ContractServiceImpl implements ContractService {
 	private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
 
 	@Override
-	public SysUserTsign register(Integer userId) {
+	public SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo) {
 
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
 
-			SysUser user = sysUserFeignService.queryUserById(userId);
-			if (user == null) {
-				return null;
-			}
-			String accountId = eSealPlugin.createUserAccount(user.getRealName(), user.getIdCardNo(), user.getPhone());
+			String accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
 
 			if (StringUtils.isBlank(accountId)) {
 				throw new BizException("创建电子存证账户失败");
@@ -112,7 +108,7 @@ public class ContractServiceImpl implements ContractService {
 			sysUserTsign = new SysUserTsign(userId, accountId, sealData);
 
 			sysUserTsignService.insert(sysUserTsign);
-			
+
 			return sysUserTsign;
 		}
 
@@ -125,7 +121,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -209,7 +209,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -348,7 +352,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -465,7 +473,11 @@ public class ContractServiceImpl implements ContractService {
 		SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
 
 		if (sysUserTsign == null) {
-			sysUserTsign = register(userId);
+			SysUser user = sysUserFeignService.queryUserById(userId);
+			if(user == null){
+				throw new BizException("用户信息查询失败");
+			}
+			sysUserTsign = register(userId,user.getRealName(),user.getIdCardNo(),user.getPhone());
 		}
 
 		// 合成freemarker
@@ -485,7 +497,7 @@ public class ContractServiceImpl implements ContractService {
 
 		// 查询参数信息
 		StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-		
+
 		int subjectId = studentInfo.getSubject().getId();
 
 		Subject subject = subjectService.get(subjectId);
@@ -495,8 +507,8 @@ public class ContractServiceImpl implements ContractService {
 
 		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
 		params.put("goodsList", goodsList);
-		
-		MusicGroupSubjectPlan musicGroupSubjectPlan =musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 		if (musicGroupSubjectPlan == null) {
 			throw new BizException("声部课程费用设置找不到");
 		}
@@ -553,7 +565,7 @@ public class ContractServiceImpl implements ContractService {
 
 		// 查询参数信息
 		StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-		
+
 		int subjectId = studentInfo.getSubject().getId();
 
 		Subject subject = subjectService.get(subjectId);
@@ -563,8 +575,8 @@ public class ContractServiceImpl implements ContractService {
 
 		List<Goods> goodsList = studentPaymentOrderService.queryApplyGoodsList(musicGroupId, OrderDetailTypeEnum.MUSICAL);
 		params.put("goodsList", goodsList);
-		
-		MusicGroupSubjectPlan musicGroupSubjectPlan =musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
+
+		MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.getMusicOneSubjectClassPlan(musicGroupId, subjectId);
 		if (musicGroupSubjectPlan == null) {
 			throw new BizException("声部课程费用设置找不到");
 		}

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

@@ -86,7 +86,7 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(),"CNY"));
 		//添加用户电子签章账户
-		contractService.register(employee.getId());
+		contractService.register(employee.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(),
 				StringUtils.isEmpty(employee.getAvatar())?"https://daya-online.oss-cn-beijing.aliyuncs.com/201910/RgHwgKc.jpg":employee.getAvatar()));
 		employee.setImToken(imResult.getToken());

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

@@ -165,8 +165,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             userId = sysUser.getId();
             //添加用户现金账户
             sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
-            //添加用户电子签章账户
-            contractService.register(userId);
+			// 添加用户电子签章账户
+			contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
             //注册到融云
             ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
             sysUser.setImToken(register.getToken());
@@ -379,7 +379,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 //添加用户现金账户
                 sysUserCashAccountDao.insert(new SysUserCashAccount(userId, "CNY"));
                 //添加用户电子签章账户
-                contractService.register(userId);
+                contractService.register(userId, sysUser.getRealName(), sysUser.getIdCardNo(), sysUser.getPhone());
                 //注册到融云
                 ImResult register = imFeignService.register(new ImUserModel(userId.toString(), sysUser.getUsername(), sysUser.getAvatar()));
                 sysUser.setImToken(register.getToken());

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

@@ -96,7 +96,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		//添加用户现金账户
 		sysUserCashAccountDao.insert(new SysUserCashAccount(teacher.getId(),"CNY"));
 		//添加用户电子签章账户
-		contractService.register(teacher.getId());
+		contractService.register(teacher.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
 		teacherDao.insert(teacher);
 		ImResult imResult = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), teacher.getAvatar()));
 		if(imResult != null){