From edbae82e7d188ee7761f9ec9c04b3b70d0f221ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= Date: Fri, 19 Jan 2024 15:49:23 +0800 Subject: [PATCH] 123 --- .../ruoyi/cai/domain/AccountChangeLog.java | 1 + .../dto/app/query/index/UserMapperQuery.java | 12 ++++ .../cai/dto/app/query/index/UserQuery.java | 8 +-- .../ruoyi/cai/enums/AccountChangeEnum.java | 8 +-- .../cai/enums/account/AccountCateEnum.java | 27 ++++++++ .../enums/account/AccountChangeCodeEnum.java | 61 +++++++++++++++++++ .../cai/enums/account/AccountTypeEnum.java | 16 +++++ .../java/com/ruoyi/cai/mapper/UserMapper.java | 3 +- .../cai/service/impl/UserServiceImpl.java | 15 ++++- .../main/resources/mapper/cai/UserMapper.xml | 8 ++- 10 files changed, 147 insertions(+), 12 deletions(-) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserMapperQuery.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountCateEnum.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountChangeCodeEnum.java create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountTypeEnum.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountChangeLog.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountChangeLog.java index aadd750b..0265c6a6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountChangeLog.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountChangeLog.java @@ -47,6 +47,7 @@ public class AccountChangeLog implements Serializable { */ private String cateAdminName; private String cateAppName; + private String corn; private Long traceId; private String traceLinkType; /** diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserMapperQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserMapperQuery.java new file mode 100644 index 00000000..fe809a72 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserMapperQuery.java @@ -0,0 +1,12 @@ +package com.ruoyi.cai.dto.app.query.index; + +import lombok.Data; + +@Data +public class UserMapperQuery { + private String usercode; + private String nickname; + private String usercodeAndNickname; + + private Integer gender; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java index 4a68b695..bbb53889 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java @@ -7,10 +7,10 @@ import lombok.Data; @Schema(description = "用户查询") public class UserQuery { - @Schema(description = "昵称") - private String nickname; - @Schema(description = "蜜瓜号") - private String usercode; + @Schema(description = "搜索内容") + private String text; + @Schema(description = "搜索类型 1-全部 2-昵称 3-蜜瓜号") + private Integer type; @Schema(description = "性别") private Integer gender; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/AccountChangeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/AccountChangeEnum.java index 1a49916c..354f47c5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/AccountChangeEnum.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/AccountChangeEnum.java @@ -35,10 +35,10 @@ public enum AccountChangeEnum { UNION_VIDEO(403,"视频工会分成","工会提成","VIDEO",""), // 系统 - SYSTEM_COIN_INCS(1001,"后台新增余额","系统调账","RECHARGE","后台人工调增余额"), - SYSTEM_COIN_DECR(1002,"后台减少余额","系统调账","RECHARGE","后台人工调减余额"), - SYSTEM_INCOME_COIN_INCS(1003,"后台新增收益","系统调账","RECHARGE","后台人工调增收益"), - SYSTEM_INCOME_COIN_DECR(1004,"后台减小收益","系统调账","RECHARGE","后台人工调减收益"), + SYSTEM_COIN_INCS(9001,"后台新增余额","系统调账","RECHARGE","后台人工调增余额"), + SYSTEM_COIN_DECR(9002,"后台减少余额","系统调账","RECHARGE","后台人工调减余额"), + SYSTEM_INCOME_COIN_INCS(9003,"后台新增收益","系统调账","RECHARGE","后台人工调增收益"), + SYSTEM_INCOME_COIN_DECR(9004,"后台减小收益","系统调账","RECHARGE","后台人工调减收益"), ; private final Integer code; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountCateEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountCateEnum.java new file mode 100644 index 00000000..e3aba9d0 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountCateEnum.java @@ -0,0 +1,27 @@ +package com.ruoyi.cai.enums.account; + +import lombok.Getter; + +@Getter +public enum AccountCateEnum { + RECHARGE(1,"充值"), + WITHDRAW(2,"提现"), + VIDEO(3,"视频"), + GIFT(4,"礼物"), + SYSTEM(5,"系统"), +// TRANS(6,"转换"), + IM(7,"私信"), + SYSTEM_TRANS(8,"系统调账"), + GUARD(9,"守护"), + UNION(10,"工会"), + AWARD(11,"奖励"), + ; + + private final Integer code; + private final String text; + + AccountCateEnum(Integer code, String text) { + this.code = code; + this.text = text; + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountChangeCodeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountChangeCodeEnum.java new file mode 100644 index 00000000..c7e3fd44 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountChangeCodeEnum.java @@ -0,0 +1,61 @@ +package com.ruoyi.cai.enums.account; + + +import lombok.Getter; + +@Getter +public enum AccountChangeCodeEnum { + RECHARGE(101,AccountCateEnum.RECHARGE,"余额充值",AccountTypeEnum.COIN), + + WITHDRAW(201,AccountCateEnum.WITHDRAW,"提现",AccountTypeEnum.INCOME_COIN), + WITHDRAW_FAIL(202,AccountCateEnum.WITHDRAW,"提现失败",AccountTypeEnum.INCOME_COIN), + + VIDEO_INCOME(301,AccountCateEnum.VIDEO,"视频收入",AccountTypeEnum.INCOME_COIN), + VIDEO_COIN_OUT(302,AccountCateEnum.VIDEO,"视频支出",AccountTypeEnum.COIN), + VIDEO_INCOME_COIN_OUT(303,AccountCateEnum.VIDEO,"视频支出",AccountTypeEnum.INCOME_COIN), + + GIFT_INCOME(401,AccountCateEnum.GIFT,"收到礼物",AccountTypeEnum.INCOME_COIN), + GIFT_COIN_OUT(402,AccountCateEnum.GIFT,"送出礼物",AccountTypeEnum.COIN), + GIFT_INCOME_COIN_OUT(403,AccountCateEnum.GIFT,"送出礼物",AccountTypeEnum.INCOME_COIN), + + FAST_WITHDRAW(501,AccountCateEnum.SYSTEM,"首冲奖励",AccountTypeEnum.INCOME_COIN), + WITHDRAW_INVITE(502,AccountCateEnum.SYSTEM,"邀请奖励（充值）",AccountTypeEnum.INCOME_COIN), + VIDEO_INVITE(503,AccountCateEnum.SYSTEM,"邀请奖励（视频）",AccountTypeEnum.INCOME_COIN), + GIFT_INVITE(504,AccountCateEnum.SYSTEM,"邀请奖励（礼物）",AccountTypeEnum.INCOME_COIN), + GUARD_INVITE(505,AccountCateEnum.SYSTEM,"邀请奖励（守护）",AccountTypeEnum.INCOME_COIN), + REGISTER_INVITE(506,AccountCateEnum.SYSTEM,"注册奖励",AccountTypeEnum.INCOME_COIN), + RAKE_INVITE(507,AccountCateEnum.SYSTEM,"排行榜奖励",AccountTypeEnum.INCOME_COIN), + + IM_INCOME(701,AccountCateEnum.IM,"收到的私信",AccountTypeEnum.INCOME_COIN), + IM_COIN_OUT(702,AccountCateEnum.IM,"送出私信",AccountTypeEnum.COIN), + IM_INCOME_COIN_OUT(703,AccountCateEnum.IM,"送出私信",AccountTypeEnum.INCOME_COIN), + + SYSTEM_COIN_INCS(801,AccountCateEnum.SYSTEM_TRANS,"系统调账",AccountTypeEnum.COIN), + SYSTEM_COIN_DECR(802,AccountCateEnum.SYSTEM_TRANS,"系统调账",AccountTypeEnum.COIN), + SYSTEM_INCOME_COIN_INCS(803,AccountCateEnum.SYSTEM_TRANS,"系统调账",AccountTypeEnum.INCOME_COIN), + SYSTEM_INCOME_COIN_DECR(804,AccountCateEnum.SYSTEM_TRANS,"系统调账",AccountTypeEnum.INCOME_COIN), + + GUARD_INCOME(901,AccountCateEnum.GUARD,"收到守护",AccountTypeEnum.INCOME_COIN), + GUARD_COIN_OUT(902,AccountCateEnum.GUARD,"送出守护",AccountTypeEnum.COIN), + GUARD_INCOME_COIN_OUT(903,AccountCateEnum.GUARD,"送出守护",AccountTypeEnum.INCOME_COIN), + + UNION_INVITE(1001,AccountCateEnum.UNION,"工会分成",AccountTypeEnum.INCOME_COIN), + + ; + + private final Integer code; + private final AccountCateEnum cate; + private final String text; + /** + * 1-余额 + * 2-收益 + */ + private final AccountTypeEnum accountType; + + AccountChangeCodeEnum(Integer code, AccountCateEnum cate, String text, AccountTypeEnum accountType) { + this.code = code; + this.cate = cate; + this.text = text; + this.accountType = accountType; + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountTypeEnum.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountTypeEnum.java new file mode 100644 index 00000000..f6c52bf2 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountTypeEnum.java @@ -0,0 +1,16 @@ +package com.ruoyi.cai.enums.account; + +import lombok.Getter; + +@Getter +public enum AccountTypeEnum { + COIN(1), + INCOME_COIN(2), + + ; + private final Integer code; + + AccountTypeEnum(Integer code) { + this.code = code; + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java index 3478ebeb..e79dfbd8 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.cai.domain.User; import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.dto.app.query.index.GreetQuery; +import com.ruoyi.cai.dto.app.query.index.UserMapperQuery; import com.ruoyi.cai.dto.app.query.index.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserListVo; import org.apache.ibatis.annotations.Param; @@ -20,7 +21,7 @@ import java.util.List; public interface UserMapper extends BaseMapper { Page pageAdmin(@Param("build") Page build, @Param("query") User query); - Page pageApp(@Param("build") Page build, @Param("query") UserQuery query); + Page pageApp(@Param("build") Page build, @Param("query") UserMapperQuery query); Page greetPageApp(@Param("build") Page build, @Param("query") GreetQuery query); List getGreetNumId(@Param("userId") Long userId); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java index 35b9627c..aa074ad9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.cai.domain.*; import com.ruoyi.cai.dto.admin.vo.UserAdminVo; import com.ruoyi.cai.dto.app.query.index.GreetQuery; +import com.ruoyi.cai.dto.app.query.index.UserMapperQuery; import com.ruoyi.cai.dto.app.query.index.UserQuery; import com.ruoyi.cai.dto.app.vo.user.UserInfoVo; import com.ruoyi.cai.dto.app.vo.user.UserListVo; @@ -79,7 +80,19 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override public Page pageApp(PageQuery page, UserQuery query) { - return baseMapper.pageApp(page.build(),query); + UserMapperQuery mapperQuery = new UserMapperQuery(); + mapperQuery.setGender(query.getGender()); + if(query.getType() == null || StringUtils.isEmpty(query.getText())){ + return new Page<>(); + } + if(query.getType() == 1){ + mapperQuery.setUsercodeAndNickname(query.getText()); + }else if(query.getType() == 2){ + mapperQuery.setUsercode(query.getText()); + }else if(query.getType() == 3){ + mapperQuery.setNickname(query.getText()); + } + return baseMapper.pageApp(page.build(),mapperQuery); } @Override diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml index 6bcda698..55863e28 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml @@ -31,16 +31,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by t2.last_login_time desc