Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_payment_config_0218

# Conflicts:
#	mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -10,6 +10,7 @@ import com.ym.mec.auth.service.SysUserService;
 import com.ym.mec.auth.service.TenantInfoService;
 import com.ym.mec.auth.web.controller.queryInfo.QRLoginDto;
 import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.dto.RealnameAuthenticationDto;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
@@ -58,10 +59,10 @@ public class UserController extends BaseController {
 	@Resource
 	private RedisCache<String,Object> redisCache;
 
-	@Value("${message.debugMode}")
+	/*@Value("${message.debugMode}")
 	private boolean debugMode;
-	@Resource
-	private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;
+	@Autowired
+	private RealnameAuthenticationPluginContext realnameAuthenticationPluginContext;*/
 
 	@ApiOperation(value = "分页查询用户信息")
 	@ApiImplicitParams({ @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "String"),
@@ -255,8 +256,10 @@ public class UserController extends BaseController {
 				throw new BizException("出生日期不可超过当前时间");
 			}
 
-			if(!debugMode&&StringUtils.isNotBlank(sysUser.getCertificateType())&&"IDENTITY".equals(sysUser.getCertificateType())){
-				realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(sysUser.getRealName(), sysUser.getIdCardNo());
+			if(StringUtils.isNotBlank(sysUser.getCertificateType())&&"IDENTITY".equals(sysUser.getCertificateType())){
+				//取消第三方实名认证，通过正则校验
+//				realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(sysUser.getRealName(), sysUser.getIdCardNo());
+				RealnameAuthenticationDto.verify(sysUser.getRealName(), sysUser.getIdCardNo());
 			}
 
 			sysUserService.updateBaseInfo(sysUser);

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

@@ -1,93 +1,53 @@
 package com.ym.mec.biz.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
-import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
-import com.ym.mec.biz.dal.dao.StudentDao;
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.dao.SysUserContractsDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.CirculationUser;
 import com.ym.mec.biz.dal.dto.OAFinancialDto;
 import com.ym.mec.biz.dal.dto.StudentInfo;
 import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
-import com.ym.mec.biz.dal.entity.Goods;
-import com.ym.mec.biz.dal.entity.MusicGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.entity.SysUserContracts;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.SysUserContracts.ContractType;
-import com.ym.mec.biz.dal.entity.SysUserTsign;
-import com.ym.mec.biz.dal.entity.TenantConfig;
-import com.ym.mec.biz.dal.entity.TenantContractTemplate;
-import com.ym.mec.biz.dal.entity.TenantInfo;
-import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-import com.ym.mec.biz.service.ContractService;
-import com.ym.mec.biz.service.GoodsService;
-import com.ym.mec.biz.service.MusicGroupService;
-import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
-import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
-import com.ym.mec.biz.service.OrganizationService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysUserContractsService;
-import com.ym.mec.biz.service.SysUserTsignService;
-import com.ym.mec.biz.service.TenantConfigService;
-import com.ym.mec.biz.service.TenantContractTemplateService;
-import com.ym.mec.biz.service.TenantInfoService;
-import com.ym.mec.biz.service.VipGroupService;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.dto.RealnameAuthenticationDto;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.eseal.ESealPlugin;
 import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
-import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.freemarker.FreemarkerTemplateEngine;
 import com.ym.mec.util.money.MoneyUtil;
 import com.ym.mec.util.pdf.PDFUtil;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ContractServiceImpl implements ContractService {
@@ -246,11 +206,13 @@ public class ContractServiceImpl implements ContractService {
             }
 
             if (CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
-                if (!debugMode) {
+                // 取消第三方实名认证
+                RealnameAuthenticationDto.verify(realName, idCardNo);
+                /*if (!debugMode) {
                     realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
-                }
+                }*/
 
-                accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
+                /*accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
 
                 if (StringUtils.isBlank(accountId)) {
                     throw new BizException("创建电子存证账户失败");
@@ -260,7 +222,7 @@ public class ContractServiceImpl implements ContractService {
 
                 if (StringUtils.isBlank(sealData)) {
                     throw new BizException("创建电子存证印章失败");
-                }
+                }*/
             }
 
             sysUserTsign = new SysUserTsign(userId, accountId, sealData, realName, idCardNo, user.getTenantId());
@@ -310,9 +272,9 @@ public class ContractServiceImpl implements ContractService {
             throw new BizException("生成pdf协议失败", e);
         }
 
-        if (sysUserTsign != null) {
+        /*if (sysUserTsign != null) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         Date date = new Date();
         // 上传到oss
@@ -450,7 +412,7 @@ public class ContractServiceImpl implements ContractService {
         } catch (IOException e) {
             throw new BizException("生成pdf协议失败", e);
         }
-        String organCode = "";
+        /*String organCode = "";
         if (musicGroup.getOwnershipType() == OwnershipType.OWN) {
             organCode = "91440300326364429H";
         } else {
@@ -464,7 +426,7 @@ public class ContractServiceImpl implements ContractService {
         eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
         if (sysUserTsign != null) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
@@ -631,7 +593,7 @@ public class ContractServiceImpl implements ContractService {
         } catch (IOException e) {
             throw new BizException("生成pdf协议失败", e);
         }
-        String organCode = "91440300326364429H";
+        /*String organCode = "91440300326364429H";
         SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
         if (organTsign == null) {
             throw new BizException("甲方未创建签章");
@@ -641,7 +603,7 @@ public class ContractServiceImpl implements ContractService {
 
         if (sysUserTsign != null) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
@@ -875,7 +837,7 @@ public class ContractServiceImpl implements ContractService {
         } catch (IOException e) {
             throw new BizException("生成pdf协议失败", e);
         }
-        String organCode = "91440300326364429H";
+        /*String organCode = "91440300326364429H";
         SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
         if (organTsign == null) {
             throw new BizException("甲方未创建签章");
@@ -885,7 +847,7 @@ public class ContractServiceImpl implements ContractService {
 
         if (sysUserTsign != null) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
@@ -929,12 +891,12 @@ public class ContractServiceImpl implements ContractService {
 
         SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
         if (sysUserTsign == null) {
-            try {
-                sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+            sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+            /*try {
             } catch (Exception e) {
                 logger.error("用户电子签章注册失败", e);
                 return;
-            }
+            }*/
         }
         Date date = new Date();
 
@@ -1026,7 +988,7 @@ public class ContractServiceImpl implements ContractService {
             return;
         }
 
-        String organCode = StringUtils.equals(companyName, tenantInfo.getTsignName()) ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
+        /*String organCode = StringUtils.equals(companyName, tenantInfo.getTsignName()) ? tenantInfo.getTsignCode() : organizationDto.getCorporateCode();
         
 		if (user.getTenantId() == 1) {
 			if (!OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
@@ -1042,7 +1004,7 @@ public class ContractServiceImpl implements ContractService {
         eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
         if (sysUserTsign != null && CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
@@ -1181,7 +1143,7 @@ public class ContractServiceImpl implements ContractService {
         List<SysUser> users = employeeDao.getUsers(circulationUserIds);
 
         Integer workOrderId = null;
-        List<SysUserTsign> sysUserTsigns = new ArrayList<>();
+//        List<SysUserTsign> sysUserTsigns = new ArrayList<>();
         for (SysUser user : users) {
             for (CirculationUser circulationUser : financialDto.getCirculationUsers()) {
                 if (workOrderId == null) {
@@ -1196,14 +1158,14 @@ public class ContractServiceImpl implements ContractService {
             }
             SysUserTsign sysUserTsign = sysUserTsignService.get(user.getId());
             if (sysUserTsign == null) {
-                try {
-                    sysUserTsign = register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+                sysUserTsign = register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+                /*try {
                 } catch (Exception e) {
                     logger.error("用户电子签章注册失败", e);
                     continue;
-                }
+                }*/
             }
-            sysUserTsigns.add(sysUserTsign);
+//            sysUserTsigns.add(sysUserTsign);
         }
 
         Date date = new Date();
@@ -1242,9 +1204,9 @@ public class ContractServiceImpl implements ContractService {
             logger.error("生成签章协议失败", e);
         }
 
-        for (SysUserTsign sysUserTsign : sysUserTsigns) {
+        /*for (SysUserTsign sysUserTsign : sysUserTsigns) {
             eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), sysUserTsign.getUserId().toString(), srcPdfPath, srcPdfPath);
-        }
+        }*/
 
         //上传到oss
         String dateStrOss = dateFormatOss.format(date);

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

@@ -341,7 +341,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
     private <T> void checkOrderState(T obj, Function<T, DealStatusEnum> func) {
         DealStatusEnum em = func.apply(obj);
         if (predicate.test(obj, em)) {
-            String msg = em.equals(DealStatusEnum.SUCCESS) ? "订单已支付，请勿重复支付" : "订单已关闭，不能支付";
+            String msg = em.equals(DealStatusEnum.SUCCESS) ? "订单已支付，请勿重复支付" : "订单已关闭，请重新下单";
             throw new BizException(msg);
         }
     }

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

@@ -191,10 +191,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
             //升级机构协议版本号
             tenantContractTemplateService.upgradeContractVersion(tenantId);
             
-			if (StringUtils.isNotBlank(organization.getCorporateName()) && StringUtils.isNotBlank(organization.getCorporateCode())) {
+			/*if (StringUtils.isNotBlank(organization.getCorporateName()) && StringUtils.isNotBlank(organization.getCorporateCode())) {
 				// 添加签章信息
 				contractService.addTsign(organization.getId(), organization.getCorporateCode(), organization.getCorporateName(), tenantId);
-			}
+			}*/
         }
 		
 		return true;

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

@@ -4286,11 +4286,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 }
             }
         }
-        try {
+        /*try {
             contractService.register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
         } catch (Exception e) {
             LOGGER.error("[{}]小课购买协议生成错误：{}", practiceGroup.getId(), e.getCause());
-        }
+        }*/
 
         String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //分类费用 course，instrument，accessories，other

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

@@ -11,6 +11,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.*;
+import com.ym.mec.common.dto.RealnameAuthenticationDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.EFriendRoleType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
@@ -25,7 +26,6 @@ import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
-import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -40,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.text.MessageFormat;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -661,7 +660,9 @@ public class SchoolStaffServiceImpl extends ServiceImpl<SchoolStaffMapper, Schoo
 
         // 验证数据合法
         if (!debugMode) {
-            realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idcardNo);
+//            realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idcardNo);
+            // 取消第三方实名认证
+            RealnameAuthenticationDto.verify(realName, idcardNo);
         }
 
         // 保存到sys_user表中

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

@@ -1549,7 +1549,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         studentInfo.setCurrentClass(studentRegistration.getCurrentClass());
         studentDao.update(studentInfo);
         // 添加用户电子签章账户
-        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/TeacherServiceImpl.java

@@ -11,7 +11,6 @@ import com.ym.mec.biz.dal.dao.ImUserFriendDao;
 import com.ym.mec.biz.dal.dao.MusicGroupDao;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.SchoolDao;
-import com.ym.mec.biz.dal.dao.StudentDao;
 import com.ym.mec.biz.dal.dao.StudentExtracurricularExercisesSituationDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
@@ -19,18 +18,7 @@ import com.ym.mec.biz.dal.dao.StudentTeacherMapperDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
 import com.ym.mec.biz.dal.dao.SysUserCashAccountDao;
 import com.ym.mec.biz.dal.dao.TeacherDao;
-import com.ym.mec.biz.dal.dto.BaseMapDto;
-import com.ym.mec.biz.dal.dto.BasicUserDto;
-import com.ym.mec.biz.dal.dto.ImUserFriendDto;
-import com.ym.mec.biz.dal.dto.MusicGroupStudentApplyDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeacherAttendanceDto;
-import com.ym.mec.biz.dal.dto.MusicGroupTeachersDto;
-import com.ym.mec.biz.dal.dto.SysUserDto;
-import com.ym.mec.biz.dal.dto.TeacherBasicDto;
-import com.ym.mec.biz.dal.dto.TeacherCloseDto;
-import com.ym.mec.biz.dal.dto.TeacherDefaultSalaryDto;
-import com.ym.mec.biz.dal.dto.TeacherExercisesServiceDto;
-import com.ym.mec.biz.dal.dto.TeacherMusicStudentOverViewDto;
+import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseHomework;
 import com.ym.mec.biz.dal.entity.ImUserFriend;
 import com.ym.mec.biz.dal.entity.MusicGroup;
@@ -54,6 +42,7 @@ import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.biz.service.TenantInfoService;
 import com.ym.mec.common.constant.CommonConstants;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.dto.RealnameAuthenticationDto;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImResult;
 import com.ym.mec.common.entity.ImUserModel;
@@ -65,7 +54,6 @@ import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.im.ImFeignService;
 import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
-import com.ym.mec.thirdparty.user.realname.provider.LinkfaceRealnameAuthenticationPlugin;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.idcard.IdcardValidator;
@@ -733,7 +721,10 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
             throw new BizException("身份证校验失败");
         }
 
-        realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idcardNo);
+//        realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idcardNo);
+        // 取消第三方实名认证
+        RealnameAuthenticationDto.verify(realName, idcardNo);
+
 
         Date date = new Date();
 

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

@@ -259,7 +259,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
             //升级机构协议版本号
             tenantContractTemplateService.upgradeContractVersion(tenantId);
             //添加签章信息
-            contractService.addTsign(tenantInfo.getUserId(), dto.getTsignCode(), dto.getTsignName(), tenantId);
+//            contractService.addTsign(tenantInfo.getUserId(), dto.getTsignCode(), dto.getTsignName(), tenantId);
         }
 
         //机构状态 1已缴费，并且 机构注册的手机号与本次修改后的手机号不同，就证明本次修改了手机号 则需要修改机构的账号信息
@@ -461,7 +461,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         Lists.partition(collectMenuId, 50)
                 .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
         //添加签章信息
-        contractService.addTsign(tenantInfo.getUserId(), tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
+//        contractService.addTsign(tenantInfo.getUserId(), tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
 
         Date now = new Date();
 

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

@@ -2786,11 +2786,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 }
             }
         }
-        try {
+        /*try {
             contractService.register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
         } catch (Exception e) {
             businessLogger.error("[{}]课程购买协议生成错误：{}", vipGroup.getId(), e.getCause());
-        }
+        }*/
 
         String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
         //分类费用 course，instrument，accessories，other

mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -611,21 +611,21 @@
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
         SELECT sut.name_ real_name_,
-        sut.card_no_ id_card_no_,
-        u.*,
-        sr.name_,
-        sr.current_class_,
-        sr.current_grade_,
-        sr.actual_subject_id_,
-        sr.parents_name_,
-        s.name_ subject_name_
+               sut.card_no_ id_card_no_,
+               u.*,
+               sr.name_,
+               sr.current_class_,
+               sr.current_grade_,
+               sr.actual_subject_id_,
+               sr.parents_name_,
+               s.name_ subject_name_
         FROM sys_user u
-        LEFT JOIN student_registration sr ON u.id_ = sr.user_id_
-        LEFT JOIN subject s ON sr.actual_subject_id_ = s.id_
-        LEFT JOIN sys_user_tsign sut ON sut.user_id_ = u.id_
+                 LEFT JOIN student_registration sr ON u.id_ = sr.user_id_
+                 LEFT JOIN subject s ON sr.actual_subject_id_ = s.id_
+                 LEFT JOIN sys_user_tsign sut ON sut.user_id_ = u.id_
         WHERE u.id_ = #{userId}
         ORDER BY sr.create_time_ DESC
-        limit 1
+            limit 1
     </select>
 
     <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration">

mec-common/common-core/src/main/java/com/ym/mec/common/dto/RealnameAuthenticationDto.java

@@ -0,0 +1,21 @@
+package com.ym.mec.common.dto;
+
+import com.microsvc.toolkit.common.webportal.exception.BizException;
+
+public class  RealnameAuthenticationDto  {
+	public static boolean verify(String realname, String idcardNo) {
+		//取消第三方实名认证，通过正则校验
+		if (realname == null || idcardNo == null) {
+			return false;
+		}
+		//校验身份证号码
+		if (!idcardNo.matches("(^\\d{6}(18|19|20)\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|X|x)$)|(^\\d{6}\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\\d|3[01])\\d{3}$)")) {
+			throw new BizException("身份证格式不正确");
+		}
+		//校验姓名
+		if (!realname.matches("^[\u4e00-\u9fa5]{2,4}$")) {
+			throw new BizException("姓名格式不正确");
+		}
+		return true;
+	}
+}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -262,7 +262,6 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
      * @return
      */
     public boolean userSign(String accountId, String sealData, String srcPdfPath, String destPdfPath) {
-
         SignPDFFileBean signPDFStreamBean = new SignPDFFileBean();
         // C:test_signed.pdf为平台自身签署后路径
         signPDFStreamBean.setSrcPdfFile(srcPdfPath);