diff --git a/mcwl-communityCenter/pom.xml b/mcwl-communityCenter/pom.xml index 7561cc4..8533a4b 100644 --- a/mcwl-communityCenter/pom.xml +++ b/mcwl-communityCenter/pom.xml @@ -31,6 +31,12 @@ com.mcwl mcwl-system + + com.mcwl + mcwl-myInvitation + 3.8.8 + compile + diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java index ef5f986..8560b49 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityVo.java @@ -87,12 +87,6 @@ public class CommunityVo { @ApiModelProperty(value = "加入人数") private Integer joinNum; - /** - * 发布数量 - */ - @ApiModelProperty(value = "发布数量") - private Integer publishNum; - /** * 是否加入 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java index d6827be..6e1cd65 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/CommunityServiceImpl.java @@ -26,6 +26,8 @@ import com.mcwl.communityCenter.mapper.CommunityMapper; import com.mcwl.communityCenter.mapper.CommunityUserMapper; import com.mcwl.communityCenter.service.CommunityService; import com.mcwl.communityCenter.service.PublishService; +import com.mcwl.myInvitation.domain.Consume; +import com.mcwl.myInvitation.mapper.ConsumeMapper; import com.mcwl.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -54,6 +56,9 @@ public class CommunityServiceImpl extends ServiceImpl impl private final PublishReportMapper publishReportMapper; + private final RedisCache redisCache; + @Override public PublishVo getDetail(PublishDetailRes publishDetailRes) { @@ -111,6 +114,8 @@ public class PublishServiceImpl extends ServiceImpl impl publish.setPublishTime(new Date()); } baseMapper.insertPublish(publish); + redisCache.deleteObject("communityPublishNumMap"); + return R.ok(); } diff --git a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml index bc3f3e6..164b6e9 100644 --- a/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml +++ b/mcwl-communityCenter/src/main/resources/mapper/communityCenter/CommunityUserMapper.xml @@ -104,6 +104,7 @@ and ((CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') >= start_time AND CONVERT_TZ(NOW(), 'SYSTEM', '+08:00') <= end_time) or (start_time is null and end_time is null)) and (black_end_time is null or NOW() >= black_end_time) + and del_flag = '0'; diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java index e91808d..a6ad7bd 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/Consume.java @@ -29,7 +29,7 @@ public class Consume extends BaseEntity { // 商品id private Long productId; - // 商品类型 0模型 1工作流 2图片 + // 商品类型 0模型 1工作流 2图片 3社区 private Integer type; // 剩余金币 diff --git a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java index d30f77d..44d4be2 100644 --- a/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java +++ b/mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/service/impl/ConsumeServiceImpl.java @@ -81,6 +81,9 @@ public class ConsumeServiceImpl extends ServiceImpl impl case 2: consumeVo.setProductName("图片"); break; + case 3: + consumeVo.setProductName("社区"); + break; } consumeVoList.add(consumeVo);