|
@@ -15,7 +15,7 @@ import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
|
|
|
import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseUserBindDO;
|
|
|
import com.citu.module.menduner.system.dal.dataobject.invite.EnterpriseInviteDO;
|
|
|
import com.citu.module.menduner.system.dal.dataobject.invite.EnterpriseInviteRecordDO;
|
|
|
-import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
|
|
|
+import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
|
|
|
import com.citu.module.menduner.system.dal.mysql.invite.EnterpriseInviteRecordMapper;
|
|
|
import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
|
|
|
import com.citu.module.menduner.system.enums.MendunerStatusEnum;
|
|
@@ -24,6 +24,7 @@ import com.citu.module.menduner.system.enums.invite.EnterpriseInviteTypeEnum;
|
|
|
import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
|
|
|
import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
|
|
|
import com.citu.module.menduner.system.service.person.info.PersonInfoService;
|
|
|
+import com.citu.module.menduner.system.service.user.MdeUserService;
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
@@ -57,6 +58,9 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
|
|
|
@Resource
|
|
|
private PersonInfoService personInfoService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private MdeUserService mdeUserService;
|
|
|
+
|
|
|
@Override
|
|
|
public Long createEnterpriseInviteRecord(EnterpriseInviteRecordSaveReqVO createReqVO) {
|
|
|
// 插入
|
|
@@ -134,11 +138,12 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
|
|
|
}
|
|
|
|
|
|
// 获取用户信息
|
|
|
- PersonInfoDO person = personInfoService.getUserInfoByUserId(userId);
|
|
|
- if (null == person) {
|
|
|
- // 用户信息不存在
|
|
|
- throw exception(ENTERPRISE_INVITE_RECORD_PERSON_INFO_NOT_COMPLETE);
|
|
|
- }
|
|
|
+// PersonInfoDO person = personInfoService.getUserInfoByUserId(userId);
|
|
|
+// if (null == person) {
|
|
|
+// // 用户信息不存在
|
|
|
+// throw exception(ENTERPRISE_INVITE_RECORD_PERSON_INFO_NOT_COMPLETE);
|
|
|
+// }
|
|
|
+ MdeUserDO user = mdeUserService.getMdeUser2(userId);
|
|
|
|
|
|
// 获取邀请的企业信息
|
|
|
EnterpriseDO enterprise = enterpriseService.getEnterprise(invite.getEnterpriseId());
|
|
@@ -147,14 +152,18 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
|
|
|
EnterpriseUserBindDO userBindDO = new EnterpriseUserBindDO();
|
|
|
userBindDO.setEnterpriseId(enterprise.getId());
|
|
|
userBindDO.setUserId(userId);
|
|
|
- userBindDO.setName(person.getName());
|
|
|
- userBindDO.setAvatar(person.getAvatar());
|
|
|
- userBindDO.setSex(person.getSex());
|
|
|
+// userBindDO.setName(person.getName());
|
|
|
+// userBindDO.setAvatar(person.getAvatar());
|
|
|
+// userBindDO.setSex(person.getSex());
|
|
|
userBindDO.setStatus(MendunerStatusEnum.ENABLE.getStatus());
|
|
|
userBindDO.setUserType(EnterpriseUserTypeEnum.NORMAL.getType());
|
|
|
- userBindDO.setPhone(person.getPhone());
|
|
|
+// userBindDO.setPhone(person.getPhone());
|
|
|
userBindDO.setEmail(reqVO.getEmail());
|
|
|
|
|
|
+ userBindDO.setName(user.getUsername());
|
|
|
+ userBindDO.setPhone(user.getPhone());
|
|
|
+
|
|
|
+
|
|
|
userBindService.createUser(userBindDO);
|
|
|
|
|
|
|
|
@@ -185,7 +194,7 @@ public class EnterpriseInviteRecordServiceImpl implements EnterpriseInviteRecord
|
|
|
mapper.insert(
|
|
|
EnterpriseInviteRecordDO.builder()
|
|
|
.enterpriseId(EnterpriseInviteTypeEnum.COLLEAGUE.getType()
|
|
|
- .equals(invite.getType())? invite.getEnterpriseId():enterpriseId)
|
|
|
+ .equals(invite.getType()) ? invite.getEnterpriseId() : enterpriseId)
|
|
|
.userId(userId)
|
|
|
.inviteEnterpriseId(invite.getEnterpriseId())
|
|
|
.inviteUserId(invite.getUserId())
|