Merge branch 'zx_saas_0208_contracts' of http://git.dayaedu.com/yonge/mec into test

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

@@ -13,6 +13,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;
@@ -257,8 +258,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

@@ -18,6 +18,7 @@ import java.util.stream.Collectors;
 
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
+import com.ym.mec.common.dto.RealnameAuthenticationDto;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -81,7 +82,6 @@ import com.ym.mec.biz.service.VipGroupService;
 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;
@@ -247,7 +247,9 @@ public class ContractServiceImpl implements ContractService {
 
             if (CertificateTypeEnum.IDENTITY.getCode().equals(user.getCertificateType())) {
                 if (!debugMode) {
-                    realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
+//                    realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
+                    // 取消第三方实名认证
+                    RealnameAuthenticationDto.verify(realName, idCardNo);
                 }
 
                 accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);

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

@@ -331,7 +331,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/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/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-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-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1409,7 +1409,9 @@ public class RoomServiceImpl implements RoomService {
         DisplayEnum displayEnum = DisplayEnum.values()[type];
 
         RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
-
+        if (roomMember == null) {
+            return false;
+        }
         String roomServiceProviter = getRoomServiceProvider(roomId);
         if (displayEnum.equals(DisplayEnum.None)) {
             roomDao.updateDisplayByRid(roomId, "");