|
@@ -27,7 +27,6 @@ import com.yonge.cooleshow.biz.dal.enums.ImGroupType;
|
|
import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
|
|
import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
|
|
-import com.yonge.cooleshow.biz.dal.enums.im.EImGroupMemberRoleType;
|
|
|
|
import com.yonge.cooleshow.biz.dal.enums.im.EImUserFriendSourceForm;
|
|
import com.yonge.cooleshow.biz.dal.enums.im.EImUserFriendSourceForm;
|
|
import com.yonge.cooleshow.biz.dal.mapper.TenantGroupMapper;
|
|
import com.yonge.cooleshow.biz.dal.mapper.TenantGroupMapper;
|
|
import com.yonge.cooleshow.biz.dal.mapper.UserTenantBindRecordMapper;
|
|
import com.yonge.cooleshow.biz.dal.mapper.UserTenantBindRecordMapper;
|
|
@@ -70,6 +69,7 @@ import com.yonge.cooleshow.common.enums.ESettlementFrom;
|
|
import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
|
|
import com.yonge.cooleshow.common.enums.ETenantUnBindAuditStatus;
|
|
import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
|
|
import com.yonge.cooleshow.common.enums.UserFirstTimeTypeEnum;
|
|
import com.yonge.cooleshow.common.enums.UserLockFlag;
|
|
import com.yonge.cooleshow.common.enums.UserLockFlag;
|
|
|
|
+import com.yonge.cooleshow.common.enums.UserStatusEnum;
|
|
import com.yonge.cooleshow.common.enums.YesOrNoEnum;
|
|
import com.yonge.cooleshow.common.enums.YesOrNoEnum;
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
import com.yonge.toolset.base.exception.BizException;
|
|
import com.yonge.toolset.base.util.StringUtil;
|
|
import com.yonge.toolset.base.util.StringUtil;
|
|
@@ -240,6 +240,17 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
|
|
VipCardRecordWrapper.UserVipInfo vipType = curVipMap.getOrDefault(userId, new VipCardRecordWrapper.UserVipInfo());
|
|
VipCardRecordWrapper.UserVipInfo vipType = curVipMap.getOrDefault(userId, new VipCardRecordWrapper.UserVipInfo());
|
|
detail.setMembershipEndTime(vipType.getCurrentVipSvipEndTime());
|
|
detail.setMembershipEndTime(vipType.getCurrentVipSvipEndTime());
|
|
detail.setVipType(vipType.getCurrentVipType());
|
|
detail.setVipType(vipType.getCurrentVipType());
|
|
|
|
+
|
|
|
|
+ // 设置老师帐号状态
|
|
|
|
+ if(detail.getDelFlag() == YesOrNoEnum.YES){
|
|
|
|
+ detail.setUserStatus(UserStatusEnum.CLOSED);
|
|
|
|
+ }else{
|
|
|
|
+ if(detail.getLockFlag() == UserLockFlag.LOCKED){
|
|
|
|
+ detail.setUserStatus(UserStatusEnum.LOCKED);
|
|
|
|
+ }else{
|
|
|
|
+ detail.setUserStatus(UserStatusEnum.NORMAL);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
return detail;
|
|
return detail;
|
|
}
|
|
}
|
|
|
|
|