ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java
@@ -2,8 +2,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -119,6 +119,9 @@ @TableField(exist = false) private List<AppUser> bottomUsers; @TableField(exist = false) private Page<AppUser> bottomUsersPage; @ApiModelProperty(value = "合伙人积分数") @TableField("part_point") private Integer partPoint; ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java
@@ -10,7 +10,7 @@ /** * 缓存有效期，默认720（分钟） */ public final static long EXPIRATION = 720; public final static long EXPIRATION = 120; public final static long EXPIRATION_APPLET = 7*24*60*60; /** ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,7 +1,6 @@ package com.ruoyi.account.controller; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,7 +36,6 @@ import com.ruoyi.system.api.feignClient.SysUserClient; import com.ruoyi.system.api.model.LoginUser; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; @@ -746,7 +744,7 @@ @GetMapping("/detail") @ApiOperation(value = "用户列表-详情", tags = {"管理后台"}) public R<AppUser> detail(Long id, Integer shopId) { public R<AppUser> detail(Long id, Integer shopId, Integer pageNum, Integer pageSize) { Long userid = tokenService.getLoginUser().getUserid(); SysUser sysUser = sysUserClient.getSysUser(userid).getData(); AppUser byId = appUserService.getById(id); @@ -776,8 +774,8 @@ if (lastOrder.getData() != null) { byId.setLastOrderTime(lastOrder.getData().getCreateTime()); } List<AppUser> list = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, id).list(); byId.setBottomUsers(list); Page<AppUser> page = appUserService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<AppUser>().eq(AppUser::getInviteUserId, id)); byId.setBottomUsersPage(page); //消费总金额 if(null == shopId || 1 == sysUser.getRoleType()){ shopId = -1; ruoyi-service/ruoyi-account/src/main/resources/mapper/account/AppUserMapper.xml
@@ -79,7 +79,7 @@ </foreach> </if> </where> order by ta.is_danger desc order by ta.is_danger desc ta.create_time desc </select> <select id="getAppuserPage1" resultType="com.ruoyi.account.api.model.AppUser"> ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsEvaluateController.java
@@ -165,7 +165,7 @@ Page<GoodsEvaluate> page = goodsEvaluateService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsEvaluate>() .in(!goodsIds.isEmpty(), GoodsEvaluate::getGoodsId, goodsIds) .in(!usersNameList.isEmpty(), GoodsEvaluate::getAppUserId, usersNameList) .eq(goodsEvaluate.getStatus() != null, GoodsEvaluate::getStatus, goodsEvaluate.getStatus()) .eq(goodsEvaluate.getStatus() != null && !goodsEvaluate.getStatus().equals(0), GoodsEvaluate::getStatus, goodsEvaluate.getStatus()) .eq(GoodsEvaluate::getDelFlag, 0) .orderByDesc(GoodsEvaluate::getCreateTime));
@@ -264,7 +264,6 @@ .eq(auditStatus != null, Share::getAuditStatus, auditStatus) .in(!CollectionUtils.isEmpty(userIds),Share::getObjectId, userIds) .eq(Share::getDelFlag, 0) .orderByAsc(Share::getAuditStatus) .orderByDesc(Share::getCreateTime) .page(Page.of(pageNum, pageSize)); for (Share record : page.getRecords()) {
