shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-19 15:49:23 +08:00
parent fbc18b491d
commit edbae82e7d
10 changed files with 147 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-cai/src/main/java/com/ruoyi/cai/domain/AccountChangeLog.java
View File

@@ -47,6 +47,7 @@ public class AccountChangeLog implements Serializable {
*/
private String cateAdminName;
private String cateAppName;
private String corn;
private Long traceId;
private String traceLinkType;
/**

12
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserMapperQuery.java Normal file
View File

@@ -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;
}

8
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/query/index/UserQuery.java
View File

@@ -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;
}

8
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/AccountChangeEnum.java
View File

@@ -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;

27
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountCateEnum.java Normal file
View File

@@ -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;
}
}

61
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountChangeCodeEnum.java Normal file
View File

@@ -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;
}
}

16
ruoyi-cai/src/main/java/com/ruoyi/cai/enums/account/AccountTypeEnum.java Normal file
View File

@@ -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;
}
}

3
ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserMapper.java
View File

@@ -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<User> {
Page<UserAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("query") User query);
Page<UserListVo> pageApp(@Param("build") Page<Object> build, @Param("query") UserQuery query);
Page<UserListVo> pageApp(@Param("build") Page<Object> build, @Param("query") UserMapperQuery query);
Page<UserListVo> greetPageApp(@Param("build") Page<Object> build, @Param("query") GreetQuery query);
List<Long> getGreetNumId(@Param("userId") Long userId);

15
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserServiceImpl.java
View File

@@ -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<UserMapper, User> implements Us
@Override
public Page<UserListVo> 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

8
ruoyi-cai/src/main/resources/mapper/cai/UserMapper.xml
View File

@@ -31,16 +31,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by t2.last_login_time desc
</select>
<select id="pageApp" resultType="com.ruoyi.cai.dto.app.vo.user.UserListVo">
select t1.avatar,t1.id as user_id,t1.gender,t1.city,t1.city_id,t1.nickname,t1.usercode,t1.age,t2.last_live_time as bind_time
select t1.avatar,t1.id as user_id,t1.gender,t1.city,t1.city_id,t1.nickname,t1.usercode,
t1.age,t2.last_live_time as bind_time
from cai_user t1
join cai_user_online t2 on t1.id = t2.user_id
where t1.status = 0
<if test="query.nickname != null and query.nickname != ''">
and t1.nickname like concat('%',#{query.nickname},'%')
and t1.nickname like concat(#{query.nickname},'%')
</if>
<if test="query.usercode != null and query.usercode != ''">
and t1.usercode = #{query.usercode}
</if>
<if test="query.usercodeAndNickname != null and query.usercodeAndNickname != ''">
and (t1.usercode = #{query.usercodeAndNickname} or t1.nickname like concat(#{query.usercodeAndNickname},'%') )
</if>
<if test="query.gender != null">
and t1.gender = #{query.gender}
</if>