diff --git a/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java b/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java index 55f44a6..ed3fb48 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java +++ b/mcwl-common/src/main/java/com/mcwl/common/handler/MyMetaObjectHandler.java @@ -20,9 +20,9 @@ public class MyMetaObjectHandler implements MetaObjectHandler { @Override public void insertFill(MetaObject metaObject) { - this.setFieldValByName("createBy", SecurityUtils.getUsername(), metaObject); - this.setFieldValByName("createTime", new Date(), metaObject); - this.setFieldValByName("tenantId", SecurityUtils.getUserId(), metaObject); + this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getUsername()); + this.strictInsertFill(metaObject, "createTime", Date.class, new Date()); + this.strictInsertFill(metaObject, "tenantId", Long.class, SecurityUtils.getUserId()); } @Override diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/InviteConstant.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/InviteConstant.java index f761e00..201a3e9 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/InviteConstant.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/InviteConstant.java @@ -1,5 +1,9 @@ package com.mcwl.communityCenter.constant; + +/** + * 邀请常量 + */ public class InviteConstant { /** * 邀请类型 0普通用户 diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/StatusConstant.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/StatusConstant.java new file mode 100644 index 0000000..18c022e --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/constant/StatusConstant.java @@ -0,0 +1,17 @@ +package com.mcwl.communityCenter.constant; + +/** + * 状态常量 + */ +public class StatusConstant { + /** + * 可用 + */ + public static final int STATUS_AVAILABLE = 1; + + /** + * 不可用 + */ + public static final int STATUS_UNAVAILABLE = 0; + +} diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java index d2e4fc9..d7cd1ea 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Publish.java @@ -34,6 +34,11 @@ public class Publish extends BaseEntity { */ private String content; + /** + * 发布人 + */ + private Long userId; + /** * 发布时间 - 定时发布 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java index 8484566..c081793 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/InviteServiceImpl.java @@ -11,6 +11,7 @@ import com.mcwl.common.core.page.TableDataInfo; import com.mcwl.common.utils.SecurityUtils; import com.mcwl.common.utils.ShareCodeUtils; import com.mcwl.communityCenter.constant.InviteConstant; +import com.mcwl.communityCenter.constant.StatusConstant; import com.mcwl.communityCenter.domain.Invite; import com.mcwl.communityCenter.domain.InviteCodeMapping; import com.mcwl.communityCenter.domain.Publish; @@ -24,6 +25,7 @@ import com.mcwl.communityCenter.service.PublishService; import com.mcwl.communityCenter.service.UserCommunityService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; @@ -66,6 +68,7 @@ public class InviteServiceImpl extends ServiceImpl impleme } @Override + @Transactional(rollbackFor = Exception.class) public boolean acceptInvite(Long communityId, String inviteCode) { // 解析邀请码 @@ -74,6 +77,11 @@ public class InviteServiceImpl extends ServiceImpl impleme return false; } + // 判断是否是同一个人 + if (Objects.equals(userId, SecurityUtils.getUserId())) { + return false; + } + // 查询邀请码 InviteCodeMapping inviteCodeMapping = inviteCodeMappingService.lambdaQuery() .eq(InviteCodeMapping::getUserId, userId) @@ -85,6 +93,8 @@ public class InviteServiceImpl extends ServiceImpl impleme return false; } + inviteCodeMapping.setStatus(StatusConstant.STATUS_UNAVAILABLE); + inviteCodeMappingService.updateById(inviteCodeMapping); Invite invite = new Invite(); invite.setTenantId(userId);