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

init

Browse Source
This commit is contained in:
张良(004796)
2024-03-12 18:52:48 +08:00
parent cbf8192a73
commit b069314684
26 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserAuthController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -43,7 +42,7 @@ public class UserAuthController extends BaseController {
@SaCheckPermission("xq:userAuth:list")
@GetMapping("/list")
public TableDataInfo<UserAuthAdminVo> list(UserAuthAdminVo bo, PageQuery pageQuery) {
Page<UserAuthAdminVo> page = userAuthService.pageApp(pageQuery, bo);
Page<UserAuthAdminVo> page = userAuthService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserExtendController.java
View File

@@ -13,6 +13,7 @@ import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo;
import com.ruoyi.xq.service.UserExtendService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -41,8 +42,8 @@ public class UserExtendController extends BaseController {
*/
@SaCheckPermission("xq:userExtend:list")
@GetMapping("/list")
public TableDataInfo<UserExtend> list(UserExtend bo, PageQuery pageQuery) {
Page<UserExtend> page = userExtendService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
public TableDataInfo<UserExtendAdminVo> list(UserExtendAdminVo bo, PageQuery pageQuery) {
Page<UserExtendAdminVo> page = userExtendService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserInfoController.java
View File

@@ -42,7 +42,7 @@ public class UserInfoController extends BaseController {
@SaCheckPermission("xq:userInfo:list")
@GetMapping("/list")
public TableDataInfo<UserInfoAdminVo> list(UserInfoAdminVo bo, PageQuery pageQuery) {
Page<UserInfoAdminVo> page = userInfoService.appPage(pageQuery, bo);
Page<UserInfoAdminVo> page = userInfoService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserPicturesController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -10,9 +9,7 @@ import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.xq.domain.User;
@@ -53,7 +50,7 @@ public class UserPicturesController extends BaseController {
@SaCheckPermission("xq:userPictures:list")
@GetMapping("/list")
public TableDataInfo<UserPicturesAdminVo> list(UserPicturesAdminVo bo, PageQuery pageQuery) {
Page<UserPicturesAdminVo> page = userPicturesService.pageApp(pageQuery, bo);
Page<UserPicturesAdminVo> page = userPicturesService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

7
ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserVipController.java
View File

@@ -1,7 +1,6 @@
package com.ruoyi.xq.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -9,8 +8,6 @@ import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserVip;
@@ -22,9 +19,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Arrays;
/**
* VIP用户
@@ -47,7 +42,7 @@ public class UserVipController extends BaseController {
@SaCheckPermission("xq:userVip:list")
@GetMapping("/list")
public TableDataInfo<UserVipAdminVo> list(UserVipAdminVo bo, PageQuery pageQuery) {
Page<UserVipAdminVo> page = userVipService.pageApp(pageQuery, bo);
Page<UserVipAdminVo> page = userVipService.pageAdmin(pageQuery, bo);
return TableDataInfo.build(page);
}

13
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserExtendAdminVo.java Normal file
View File

@@ -0,0 +1,13 @@
package com.ruoyi.xq.dto.admin.user;
import com.ruoyi.xq.domain.UserExtend;
import lombok.Data;
@Data
public class UserExtendAdminVo extends UserExtend {
private String nickname;
private String mobile;
private String avatar;
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserAuthMapper.java
View File

@@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface UserAuthMapper extends BaseMapper<UserAuth> {
Page<UserAuthAdminVo> pageApp(@Param("build") Page<Object> build, @Param("bo") UserAuthAdminVo bo);
Page<UserAuthAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserAuthAdminVo bo);
}

4
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserExtendMapper.java
View File

@@ -1,7 +1,9 @@
package com.ruoyi.xq.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
@@ -15,4 +17,6 @@ import java.math.BigDecimal;
public interface UserExtendMapper extends BaseMapper<UserExtend> {
boolean decrIncome(@Param("userId") Long userId, @Param("price") BigDecimal price);
Page<UserExtendAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserExtendAdminVo bo);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserInfoMapper.java
View File

@@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface UserInfoMapper extends BaseMapper<UserInfo> {
Page<UserInfoAdminVo> pageApp(@Param("build") Page<Object> build, @Param("bo") UserInfoAdminVo bo);
Page<UserInfoAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserInfoAdminVo bo);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserPicturesMapper.java
View File

@@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface UserPicturesMapper extends BaseMapper<UserPictures> {
Page<UserPicturesAdminVo> pageApp(@Param("build") Page<Object> build, @Param("bo") UserPicturesAdminVo bo);
Page<UserPicturesAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserPicturesAdminVo bo);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/UserVipMapper.java
View File

@@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface UserVipMapper extends BaseMapper<UserVip> {
Page<UserVipAdminVo> pageApp(@Param("build") Page<Object> build, @Param("bo") UserVipAdminVo bo);
Page<UserVipAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") UserVipAdminVo bo);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserAuthService.java
View File

@@ -15,5 +15,5 @@ import com.ruoyi.xq.dto.admin.user.UserAuthAdminVo;
public interface UserAuthService extends IService<UserAuth> {
UserAuth getByUserId(Long userId);
Page<UserAuthAdminVo> pageApp(PageQuery pageQuery, UserAuthAdminVo bo);
Page<UserAuthAdminVo> pageAdmin(PageQuery pageQuery, UserAuthAdminVo bo);
}

5
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserExtendService.java
View File

@@ -1,7 +1,10 @@
package com.ruoyi.xq.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo;
import java.math.BigDecimal;
@@ -14,4 +17,6 @@ import java.math.BigDecimal;
public interface UserExtendService extends IService<UserExtend> {
boolean withdraw(Long userId, BigDecimal withdrawPrice);
Page<UserExtendAdminVo> pageAdmin(PageQuery pageQuery, UserExtendAdminVo bo);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserInfoService.java
View File

@@ -17,5 +17,5 @@ public interface UserInfoService extends IService<UserInfo> {
UserInfo getByUserId(Long userId);
Page<UserInfoAdminVo> appPage(PageQuery pageQuery, UserInfoAdminVo bo);
Page<UserInfoAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAdminVo bo);
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserPicturesService.java
View File

@@ -18,7 +18,7 @@ public interface UserPicturesService extends IService<UserPictures> {
List<UserPictures> listByUserId(Long userId);
Page<UserPicturesAdminVo> pageApp(PageQuery pageQuery, UserPicturesAdminVo bo);
Page<UserPicturesAdminVo> pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo);
void auditSuccess(String ids);

3
ruoyi-xq/src/main/java/com/ruoyi/xq/service/UserVipService.java
View File

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.User;
import com.ruoyi.xq.domain.UserVip;
import com.ruoyi.xq.domain.VipOrder;
import com.ruoyi.xq.dto.admin.user.UserVipAdminVo;
import com.ruoyi.xq.dto.admin.user.req.AddVipReq;
@@ -27,7 +26,7 @@ public interface UserVipService extends IService<UserVip> {
void incsVip(User user, Integer vipType, Integer vipMonth);
Page<UserVipAdminVo> pageApp(PageQuery pageQuery, UserVipAdminVo bo);
Page<UserVipAdminVo> pageAdmin(PageQuery pageQuery, UserVipAdminVo bo);
void removeVip(Long id);
}

4
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserAuthServiceImpl.java
View File

@@ -26,7 +26,7 @@ public class UserAuthServiceImpl extends ServiceImpl<UserAuthMapper,UserAuth> im
}
@Override
public Page<UserAuthAdminVo> pageApp(PageQuery pageQuery, UserAuthAdminVo bo) {
return baseMapper.pageApp(pageQuery.build(), bo);
public Page<UserAuthAdminVo> pageAdmin(PageQuery pageQuery, UserAuthAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}
}

8
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserExtendServiceImpl.java
View File

@@ -1,7 +1,10 @@
package com.ruoyi.xq.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.xq.domain.UserExtend;
import com.ruoyi.xq.dto.admin.user.UserExtendAdminVo;
import com.ruoyi.xq.mapper.UserExtendMapper;
import com.ruoyi.xq.service.UserExtendService;
import lombok.RequiredArgsConstructor;
@@ -26,4 +29,9 @@ public class UserExtendServiceImpl extends ServiceImpl<UserExtendMapper,UserExte
return exists;
}
@Override
public Page<UserExtendAdminVo> pageAdmin(PageQuery pageQuery, UserExtendAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}
}

4
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserInfoServiceImpl.java
View File

@@ -32,7 +32,7 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper,UserInfo> im
}
@Override
public Page<UserInfoAdminVo> appPage(PageQuery pageQuery, UserInfoAdminVo bo) {
return baseMapper.pageApp(pageQuery.build(), bo);
public Page<UserInfoAdminVo> pageAdmin(PageQuery pageQuery, UserInfoAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}
}

4
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserPicturesServiceImpl.java
View File

@@ -32,8 +32,8 @@ public class UserPicturesServiceImpl extends ServiceImpl<UserPicturesMapper,User
}
@Override
public Page<UserPicturesAdminVo> pageApp(PageQuery pageQuery, UserPicturesAdminVo bo) {
return baseMapper.pageApp(pageQuery.build(),bo);
public Page<UserPicturesAdminVo> pageAdmin(PageQuery pageQuery, UserPicturesAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(),bo);
}
@Override

4
ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserVipServiceImpl.java
View File

@@ -123,8 +123,8 @@ public class UserVipServiceImpl extends ServiceImpl<UserVipMapper,UserVip> imple
}
@Override
public Page<UserVipAdminVo> pageApp(PageQuery pageQuery, UserVipAdminVo bo) {
return baseMapper.pageApp(pageQuery.build(), bo);
public Page<UserVipAdminVo> pageAdmin(PageQuery pageQuery, UserVipAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(), bo);
}
@Override

2
ruoyi-xq/src/main/resources/mapper/xq/UserAuthMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.xq.mapper.UserAuthMapper">
<select id="pageApp" resultType="com.ruoyi.xq.dto.admin.user.UserAuthAdminVo">
<select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.user.UserAuthAdminVo">
select t1.*, t2.nickname,t2.mobile,t2.avatar
from xq_user_auth t1
left join xq_user t2 on t1.user_id = t2.id

17
ruoyi-xq/src/main/resources/mapper/xq/UserExtendMapper.xml
View File

@@ -9,6 +9,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
set income_coin = income_coin - #{price}
where income_coin - #{price} > 0 and user_id = #{userId}
</update>
<select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.user.UserExtendAdminVo">
select t1.*, t2.nickname,t2.mobile,t2.avatar
from xq_user_extend t1
left join xq_user t2 on t1.user_id = t2.id
<where>
<if test="bo.usercode != null and bo.usercode != ''">
and t1.usercode = #{bo.usercode}
</if>
<if test="bo.nickname != null and bo.nickname != ''">
and t2.nickname like concat('%',#{bo.nickname},'%')
</if>
<if test="bo.mobile != null and bo.mobile != ''">
and t2.mobile = #{bo.mobile}
</if>
</where>
order by t1.id desc
</select>
</mapper>

2
ruoyi-xq/src/main/resources/mapper/xq/UserInfoMapper.xml
View File

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.xq.mapper.UserInfoMapper">
<select id="pageApp" resultType="com.ruoyi.xq.dto.admin.user.UserInfoAdminVo">
<select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.user.UserInfoAdminVo">
select t2.*,
t1.nickname,t1.type,t1.mobile,t1.avatar,t1.gender,t1.age,t1.birthday,
t1.height,t1.weight,t1.somatotype,t1.zodiac,t1.sign,t1.residence,t1.address,t1.residence_city,

2
ruoyi-xq/src/main/resources/mapper/xq/UserPicturesMapper.xml
View File

@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.xq.mapper.UserPicturesMapper">
<select id="pageApp" resultType="com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo">
<select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.user.UserPicturesAdminVo">
select t1.*, t2.nickname, t2.mobile,t2.avatar
from xq_user_pictures t1
left join xq_user t2 on t1.user_id = t2.id

2
ruoyi-xq/src/main/resources/mapper/xq/UserVipMapper.xml
View File

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.xq.mapper.UserVipMapper">
<select id="pageApp" resultType="com.ruoyi.xq.dto.admin.user.UserVipAdminVo">
<select id="pageAdmin" resultType="com.ruoyi.xq.dto.admin.user.UserVipAdminVo">
select t1.*, t2.nickname, t2.mobile,t2.avatar
from xq_user_vip t1
left join xq_user t2 on t1.user_id = t2.id