From 71b034673eee09f84ca2d745f79b9a33b16e21c7 Mon Sep 17 00:00:00 2001 From: yang <2119157836@qq.com> Date: Fri, 28 Mar 2025 13:43:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(community):=20=E5=A2=9E=E5=8A=A0=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E5=8F=91=E5=B8=83=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityCenter/domain/Community.java | 4 ++-- .../mcwl/communityCenter/domain/Publish.java | 5 +++++ .../domain/dto/CommunityListPageRes.java | 4 ++-- .../domain/vo/CommunityDetailVo.java | 17 ++++++++++++++ .../domain/vo/CommunityVo.java | 13 ++++++++++- .../mapper/CommunityMapper.java | 7 ++++++ .../service/impl/CommunityServiceImpl.java | 7 +++++- .../communityCenter/CommunityMapper.xml | 10 +++++++++ .../memberCenter/service/MemberService.java | 1 + .../service/impl/MemberServiceImpl.java | 22 +++++++++++++++++-- 10 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Community.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Community.java index 9c38827..f002c95 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Community.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/Community.java @@ -51,8 +51,8 @@ public class Community extends BaseEntity { /** * 社区标签id */ - @ApiModelProperty(value = "社区标签id") - private Long communityTagId; + @ApiModelProperty(value = "社区标签") + private Integer communityTag; /** * 社区类型 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 d813ed9..f09ea23 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 @@ -60,6 +60,11 @@ public class Publish extends BaseEntity { */ private Date publishTime; + /** + * 精选 + */ + private Integer isElite; + /** * 点赞数 */ diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityListPageRes.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityListPageRes.java index ef70eaf..a3b4056 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityListPageRes.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/dto/CommunityListPageRes.java @@ -17,7 +17,7 @@ public class CommunityListPageRes extends PageDomain { /** * 社区标签id */ - @ApiModelProperty(value = "社区标签id") - private Long communityTagId; + @ApiModelProperty(value = "社区标签") + private Long communityTag; } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java new file mode 100644 index 0000000..03c12dc --- /dev/null +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/domain/vo/CommunityDetailVo.java @@ -0,0 +1,17 @@ +package com.mcwl.communityCenter.domain.vo; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 社区返回数据 + */ +@Data +@ApiModel(value = "社区详情返回数据") +public class CommunityDetailVo { + + + +} 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 71beb3c..633c2a6 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 @@ -12,7 +12,6 @@ import javax.validation.constraints.NotNull; * 社区返回数据 */ @Data -@TableName("cc_community") @ApiModel(value = "社区返回数据") public class CommunityVo { @@ -46,6 +45,12 @@ public class CommunityVo { @ApiModelProperty(value = "价格") private Double price; + /** + * 用户id + */ + @ApiModelProperty(value = "用户id") + private Long userId; + /** * 创建人 */ @@ -64,5 +69,11 @@ public class CommunityVo { @ApiModelProperty(value = "加入人数") private Integer joinNum; + /** + * 发布数量 + */ + @ApiModelProperty(value = "发布数量") + private Integer publishNum; + } diff --git a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java index 95acb9b..6a84e4d 100644 --- a/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java +++ b/mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/mapper/CommunityMapper.java @@ -25,4 +25,11 @@ public interface CommunityMapper extends BaseMapper { */ @InterceptorIgnore(tenantLine = "true") Map selectCommunityJoinNum(); + + /** + * 查询所有社区发布数量，以map形式返回，key为社区id，value为发布数量 + * @return map + */ + @InterceptorIgnore(tenantLine = "true") + Map selectCommunityPublishNum(); } 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 bc3df74..4f52895 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 @@ -45,6 +45,9 @@ public class CommunityServiceImpl extends ServiceImpl communityJoinNumMap = baseMapper.selectCommunityJoinNum(); + // 查询社区发布数，以map形式返回，key为社区id，value为发布数 + Map communityPublishNumMap = baseMapper.selectCommunityPublishNum(); + Page page = new Page<>(communityListPageRes.getPageNum(), communityListPageRes.getPageSize()); @@ -57,7 +60,7 @@ public class CommunityServiceImpl extends ServiceImpl() - .eq(communityListPageRes.getCommunityTagId() != null, Community::getCommunityTagId, communityListPageRes.getCommunityTagId())); + .eq(communityListPageRes.getCommunityTag() != null, Community::getCommunityTag, communityListPageRes.getCommunityTag())); List communityList = page.getRecords(); List communityVoList = new ArrayList<>(); @@ -72,8 +75,10 @@ public class CommunityServiceImpl extends ServiceImpl + \ No newline at end of file diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java index 62f7344..fd4b3d6 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/MemberService.java @@ -7,6 +7,7 @@ import com.mcwl.memberCenter.domain.Member; import com.mcwl.memberCenter.domain.vo.MemberVo; import com.mcwl.memberCenter.domain.vo.RechargeRecordVO; +import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java index dfe1121..2cb6647 100644 --- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java +++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java @@ -259,14 +259,14 @@ public class MemberServiceImpl extends ServiceImpl impleme memberConsume.setConsumeTime(new Date()); memberConsumeService.save(memberConsume); } + /** - * * @return 按用户id获取正常的会员集合 */ @Override public List getValidMemberById(Long userId) { - List memberList = this.getUseUserMember(userId); + List memberList = this.getValidMember(userId); List memberVoList = new ArrayList<>(); for (Member member : memberList) { MemberVo memberVo = BeanUtil.copyProperties(member, MemberVo.class); @@ -294,6 +294,24 @@ public class MemberServiceImpl extends ServiceImpl impleme return baseMapper.selectList(qw); } + /** + * 获取有效的会员集合 + * @param userId 用户id + * @return 有效的会员集合 + */ + private List getValidMember(Long userId) { + // startDate 小于等于当前时间、endDate 大于等于当前时间 + // subscriptionStatus 不为 "过期" 或 "待支付" + // status 为 0 的 + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.ge(Member::getEndDate, new Date()) + .ne(Member::getSubscriptionStatus, MemberEnum.MEMBER_CENTER_EXPIRED) + .ne(Member::getSubscriptionStatus, MemberEnum.MEMBER_CENTER_PENDING) + .eq(Member::getStatus, "0") + .eq(userId != null, Member::getUserId, userId); + return baseMapper.selectList(qw); + } + /** * 根据订阅周期和开始时间 计算结束时间