|  | @@ -6,16 +6,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 | 
	
		
			
				|  |  |  import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.auth.api.entity.SysUser;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.dao.TeacherAuthEntryRecordDao;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.dto.search.AuthEntryRecordSearch;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.entity.ImGroup;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.entity.Teacher;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 | 
	
		
			
				|  |  | -import com.yonge.cooleshow.biz.dal.enums.*;
 | 
	
		
			
				|  |  | -import com.yonge.cooleshow.biz.dal.service.*;
 | 
	
		
			
				|  |  | -import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.enums.AuthTypeEnum;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.service.ImGroupService;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.service.TeacherService;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.service.TeacherStyleVideoService;
 | 
	
		
			
				|  |  | +import com.yonge.cooleshow.biz.dal.service.UserFirstTimeService;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 | 
	
		
			
				|  |  |  import com.yonge.cooleshow.common.entity.HttpResponseResult;
 | 
	
	
		
			
				|  | @@ -31,15 +41,16 @@ import org.slf4j.LoggerFactory;
 | 
	
		
			
				|  |  |  import org.springframework.beans.BeanUtils;
 | 
	
		
			
				|  |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
	
		
			
				|  |  |  import org.springframework.stereotype.Service;
 | 
	
		
			
				|  |  | -import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 | 
	
		
			
				|  |  | -import com.yonge.cooleshow.biz.dal.dao.TeacherAuthEntryRecordDao;
 | 
	
		
			
				|  |  |  import org.springframework.transaction.annotation.Transactional;
 | 
	
		
			
				|  |  |  import org.springframework.util.CollectionUtils;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  import javax.annotation.Resource;
 | 
	
		
			
				|  |  |  import java.text.MessageFormat;
 | 
	
		
			
				|  |  | -import java.util.*;
 | 
	
		
			
				|  |  | -import java.util.stream.Collectors;
 | 
	
		
			
				|  |  | +import java.util.ArrayList;
 | 
	
		
			
				|  |  | +import java.util.Date;
 | 
	
		
			
				|  |  | +import java.util.HashMap;
 | 
	
		
			
				|  |  | +import java.util.List;
 | 
	
		
			
				|  |  | +import java.util.Map;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  @Service
 | 
	
		
			
				|  |  |  public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEntryRecordDao, TeacherAuthEntryRecord> implements TeacherAuthEntryRecordService {
 | 
	
	
		
			
				|  | @@ -151,13 +162,22 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
 | 
	
		
			
				|  |  |          ThreadPool.getExecutor().submit(() -> {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |              try {
 | 
	
		
			
				|  |  | -                ImGroup imGroup = new ImGroup();
 | 
	
		
			
				|  |  | -                imGroup.setName(MessageFormat.format("{0}的粉丝群", teacher.getUsername()));
 | 
	
		
			
				|  |  | -                imGroup.setIntroduce("");
 | 
	
		
			
				|  |  | -                imGroup.setAutoPassFlag(true);
 | 
	
		
			
				|  |  | -                imGroup.setCreateBy(teacher.getUserId());
 | 
	
		
			
				|  |  | +                // 判断老师是否已存在自动创建的粉丝群
 | 
	
		
			
				|  |  | +                Integer count = imGroupService.lambdaQuery()
 | 
	
		
			
				|  |  | +                        .eq(ImGroup::getCreateBy, teacher.getUserId())
 | 
	
		
			
				|  |  | +                        .eq(ImGroup::getAutoPassFlag, true).count();
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                if (count <= 0) {
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                    ImGroup imGroup = new ImGroup();
 | 
	
		
			
				|  |  | +                    imGroup.setName(MessageFormat.format("{0}的粉丝群", teacher.getUsername()));
 | 
	
		
			
				|  |  | +                    imGroup.setIntroduce("");
 | 
	
		
			
				|  |  | +                    imGroup.setAutoPassFlag(true);
 | 
	
		
			
				|  |  | +                    imGroup.setCreateBy(teacher.getUserId());
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +                    imGroupService.create(imGroup);
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -                imGroupService.create(imGroup);
 | 
	
		
			
				|  |  |              } catch (Exception e) {
 | 
	
		
			
				|  |  |                  log.error("doAuth teacherId={}", teacher.getUserId(), e);
 | 
	
		
			
				|  |  |              }
 |