From 528a4332f23f9f3ab7aea746f6f6e9803a8e234f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Mon, 29 Jan 2024 10:42:57 +0800 Subject: [PATCH] 123 --- .../cai/controller/app/UserAppController.java | 21 ++++++++++ .../com/ruoyi/cai/domain/MemberPrice.java | 4 ++ .../com/ruoyi/cai/domain/MemberSkill.java | 8 ++++ .../dto/app/query/member/UpdateNoGreet.java | 12 ++++++ .../app/query/member/UpdateRankHideReq.java | 12 ++++++ .../cai/dto/app/vo/user/MemberInfoVo.java | 9 +++++ .../ruoyi/cai/manager/CurrentUserManager.java | 2 + .../ruoyi/cai/service/UserMemberService.java | 6 +++ .../service/impl/UserMemberServiceImpl.java | 40 +++++++++++++++++++ .../java/com/ruoyi/cai/util/CaiNumUtil.java | 12 +++++- 10 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateNoGreet.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateRankHideReq.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java index 12e6668d..cc1bc175 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java @@ -4,6 +4,8 @@ import com.ruoyi.cai.dto.app.query.AlbumAddReq; import com.ruoyi.cai.dto.app.query.AlbumResetReq; import com.ruoyi.cai.dto.app.query.IdRes; import com.ruoyi.cai.dto.app.query.UserUpdateReq; +import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet; +import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq; import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo; import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo; import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo; @@ -77,6 +79,25 @@ public class UserAppController { return R.ok(userMemberService.memberApp(userId,type)); } + + @PostMapping("/updateRankHide") + @Operation(summary = "修改排行榜隐藏状态") + @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = false) + public R updateRankHide(@RequestBody UpdateRankHideReq updateRankHideReq){ + updateRankHideReq.setUserId(LoginHelper.getUserId()); + userMemberService.updateRankHide(updateRankHideReq); + return R.ok(); + } + + @PostMapping("/updateNoGreet") + @Operation(summary = "修改隐藏模式状态") + @Log(title = "修改排行榜隐藏状态", businessType = BusinessType.OTHER, isSaveDb = false) + public R updateNoGreet(@RequestBody UpdateNoGreet updateNoGreet){ + updateNoGreet.setUserId(LoginHelper.getUserId()); + userMemberService.updateNoGreet(updateNoGreet); + return R.ok(); + } + /*@PostMapping("/update/one") @Operation(summary = "完善用户必填信息") @Log(title = "完善用户必填信息", businessType = BusinessType.OTHER, isSaveDb = false) diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberPrice.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberPrice.java index d37f3943..26c6adae 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberPrice.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberPrice.java @@ -43,6 +43,10 @@ public class MemberPrice implements Serializable { */ @Schema(description = "会员价格") private BigDecimal price; + + @Schema(description = "会员价格/天") + @TableField(exist = false) + private BigDecimal dayPrice; /** * 图片地址 */ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java index 7c002365..b545bad9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/MemberSkill.java @@ -1,8 +1,10 @@ package com.ruoyi.cai.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.io.Serializable; @@ -31,14 +33,20 @@ public class MemberSkill implements Serializable { /** * 名称 */ + @TableField(value = "`name`") + @Schema(description = "名称") private String name; /** * 描述 */ + @TableField(value = "`desc`") + @Schema(description = "描述") private String desc; /** * */ + @TableField(value = "`icon`") + @Schema(description = "图片") private String icon; /** * 状态 0 可用 1 不可用 diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateNoGreet.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateNoGreet.java new file mode 100644 index 00000000..0cc10fc7 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateNoGreet.java @@ -0,0 +1,12 @@ +package com.ruoyi.cai.dto.app.query.member; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class UpdateNoGreet { + @Schema(description = "用户ID",hidden = true) + private Long userId; + @Schema(description = "隐身模式 0-关闭 1-打开") + private Integer noGreet; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateRankHideReq.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateRankHideReq.java new file mode 100644 index 00000000..f59c9f9d --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/member/UpdateRankHideReq.java @@ -0,0 +1,12 @@ +package com.ruoyi.cai.dto.app.query.member; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class UpdateRankHideReq { + @Schema(description = "用户ID",hidden = true) + private Long userId; + @Schema(description = "隐藏排行榜 0-关闭 1-打开") + private Integer rankHide; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java index e0b9079c..6f829265 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/MemberInfoVo.java @@ -2,6 +2,7 @@ package com.ruoyi.cai.dto.app.vo.user; import com.ruoyi.cai.domain.MemberPrice; import com.ruoyi.cai.domain.MemberSkill; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -14,16 +15,24 @@ public class MemberInfoVo { private String nickname; private Integer gender; private String avatar; + @Schema(description = "会员技能") private List memberPriceList; + @Schema(description = "会员价格") private List memberSkillList; + @Schema(description = "是否开通永久会员 1-永久 0-非永久") private Integer longs; + @Schema(description = "过期时间") private LocalDateTime expireTime; + @Schema(description = "过期时间字符") private String expireTimeStr; + @Schema(description = "是否开通会员") private Integer on; private String bannerPic = "images/member/vip_banner.gif"; + @Schema(description = "隐藏排行榜 0-关闭 1-打开") private Integer rankHide; + @Schema(description = "隐身模式 0-关闭 1-打开") private Integer noGreet; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java index bbd9d2d9..20a8f110 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java @@ -8,6 +8,8 @@ import com.ruoyi.cai.domain.*; import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; import com.ruoyi.cai.dto.app.query.AnchorUpdateReq; import com.ruoyi.cai.dto.app.query.UserUpdateReq; +import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet; +import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq; import com.ruoyi.cai.dto.app.vo.AnchorVo; import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo; import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java index df4dac20..4ca0b5ba 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserMemberService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.cai.domain.UserMember; import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo; +import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet; +import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq; import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo; import com.ruoyi.cai.enums.UserMemberTypeEnum; import com.ruoyi.common.core.domain.PageQuery; @@ -36,4 +38,8 @@ public interface UserMemberService extends IService { void relieveMember(Long id); MemberInfoVo memberApp(Long userId, Integer type); + + void updateRankHide(UpdateRankHideReq updateRankHideReq); + + void updateNoGreet(UpdateNoGreet updateNoGreet); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java index 00bf8e16..cd1bd4c2 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserMemberServiceImpl.java @@ -9,6 +9,8 @@ import com.ruoyi.cai.domain.MemberSkill; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.domain.UserMember; import com.ruoyi.cai.dto.admin.vo.UserMemberAdminVo; +import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet; +import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq; import com.ruoyi.cai.dto.app.vo.user.MemberInfoVo; import com.ruoyi.cai.enums.UserMemberTypeEnum; import com.ruoyi.cai.mapper.UserMemberMapper; @@ -17,6 +19,7 @@ import com.ruoyi.cai.service.MemberPriceService; import com.ruoyi.cai.service.MemberSkillService; import com.ruoyi.cai.service.UserMemberService; import com.ruoyi.cai.service.UserService; +import com.ruoyi.cai.util.CaiNumUtil; import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import org.springframework.beans.factory.annotation.Autowired; @@ -114,6 +117,9 @@ public class UserMemberServiceImpl extends ServiceImpl memberPriceList = memberPriceService.listByType(type); + for (MemberPrice memberPrice : memberPriceList) { + memberPrice.setDayPrice(CaiNumUtil.memberDay(memberPrice.getPrice(),memberPrice.getExpires())); + } memberInfoVo.setMemberPriceList(memberPriceList); List memberSkillList = memberSkillService.listByType(type); memberInfoVo.setMemberSkillList(memberSkillList); @@ -136,4 +142,38 @@ public class UserMemberServiceImpl extends ServiceImpl