分页33
This commit is contained in:
parent
d56a5df40e
commit
e8a986e476
|
|
@ -102,8 +102,8 @@ public class CourseCollectServiceImpl extends ServiceImpl<CourseCollectDao, Cour
|
|||
@CachePut(value = "app:courseCollect", key = "#userId")
|
||||
public Result selectByUserId(Integer page, Integer limit, Long userId,Integer classify) {
|
||||
PageHelper.startPage(page,limit);
|
||||
List<Course> courseIPage = baseMapper.selectCourseByCollect( userId,classify);
|
||||
PageInfo<Course> pageInfo = new PageInfo<>(courseIPage);
|
||||
List<Course> courseList = baseMapper.selectCourseByCollect( userId,classify);
|
||||
PageInfo<Course> pageInfo = new PageInfo<>(courseList);
|
||||
List<Course> courses = pageInfo.getList();
|
||||
if (courses != null && courses.size() > 0) {
|
||||
for (Course course : courses) {
|
||||
|
|
|
|||
|
|
@ -194,9 +194,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
|
|||
setCache(cacheKey, JSONUtil.toJsonStr(pageUtils));
|
||||
return Result.success().put("data", pageUtils);
|
||||
}
|
||||
List<Map<String, Object>> mapIPage = baseMapper.selectCourseAdmin(classifyId, title, isRecommend, status, bannerId,
|
||||
List<Map<String, Object>> list = baseMapper.selectCourseAdmin(classifyId, title, isRecommend, status, bannerId,
|
||||
sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow);
|
||||
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(mapIPage);
|
||||
PageInfo<Map<String, Object>> pageInfo = new PageInfo<>(list);
|
||||
List<Map<String, Object>> records = pageInfo.getList();
|
||||
for (Map<String, Object> map : records) {
|
||||
map.put("courseDetailsId", null);
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
package com.sqx.modules.integral.service.Impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.app.entity.UserMoneyDetails;
|
||||
import com.sqx.modules.app.service.UserMoneyDetailsService;
|
||||
|
|
@ -20,10 +21,7 @@ import org.springframework.stereotype.Service;
|
|||
|
||||
import java.math.BigDecimal;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Calendar;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
|
||||
@Service
|
||||
public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDetailsDao, UserIntegralDetails> implements UserIntegralDetailsService {
|
||||
|
|
@ -40,11 +38,11 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDeta
|
|||
private UserMoneyDetailsService userMoneyDetailsService;
|
||||
|
||||
@Override
|
||||
public IPage selectUserIntegralDetailsByUserId(int page, int limit, Long userId) {
|
||||
|
||||
IPage<UserIntegralDetails> page1 = userIntegralDetailsDao.selectPage(new Page<>(page, limit), new QueryWrapper<UserIntegralDetails>().eq(userId != null, "user_id", userId).orderByDesc("create_time"));
|
||||
|
||||
return page1;
|
||||
public PageUtils selectUserIntegralDetailsByUserId(int page, int limit, Long userId) {
|
||||
PageHelper.startPage(page, limit);
|
||||
List<UserIntegralDetails> list = userIntegralDetailsDao.selectList(new QueryWrapper<UserIntegralDetails>().eq(userId != null, "user_id", userId).orderByDesc("create_time"));
|
||||
PageInfo<UserIntegralDetails> pageInfo = new PageInfo<>(list);
|
||||
return PageUtils.page(pageInfo, true);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
package com.sqx.modules.integral.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.integral.entity.UserIntegralDetails;
|
||||
|
||||
public interface UserIntegralDetailsService extends IService<UserIntegralDetails> {
|
||||
|
||||
IPage selectUserIntegralDetailsByUserId(int page, int limit, Long userId);
|
||||
PageUtils selectUserIntegralDetailsByUserId(int page, int limit, Long userId);
|
||||
|
||||
Result signIn(Long userId);
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ public interface InviteDao extends BaseMapper<Invite> {
|
|||
|
||||
Double selectInviteSum(@Param("state") Integer state, @Param("userId") Long userId);
|
||||
|
||||
// IPage<Map<String,Object>> selectInviteUser(Page<Map<String,Object>> page, @Param("userId") Long userId,@Param("state") Integer state,@Param("userType") Integer userType);
|
||||
List<Map<String,Object>> selectInviteUser(@Param("code") String code);
|
||||
|
||||
Invite selectInviteByUser(@Param("userId")Long userId,@Param("inviteeUserId") Long inviteeUserId,@Param("userType") Integer userType);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
package com.sqx.modules.orders.dao;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.modules.orders.entity.Orders;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
|
@ -28,7 +26,7 @@ public interface OrdersDao extends BaseMapper<Orders> {
|
|||
|
||||
Orders selectOrdersByCourseIdAndUserId(Long userId, Long courseId);
|
||||
|
||||
IPage<Orders> selectOrdersMoneyList(Page<Orders> page, Integer flag, String time);
|
||||
List<Orders> selectOrdersMoneyList(Integer flag, String time);
|
||||
|
||||
Integer selectOrdersCount(Integer status, Integer ordersType, Integer flag, String time, Long sysUserId);
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,7 @@ import com.alibaba.fastjson.JSON;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
|
|
@ -670,20 +668,21 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
|
||||
@Override
|
||||
public Result selectOrderByUserId(Integer page, Integer limit, Long userId) {
|
||||
IPage<Orders> orderPage = new Page<>(page, limit);
|
||||
PageHelper.startPage(page, limit);
|
||||
QueryWrapper<Orders> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("user_id", userId);
|
||||
queryWrapper.eq("orders_type", 1);
|
||||
queryWrapper.eq("status", 1);
|
||||
queryWrapper.orderByDesc("create_time");
|
||||
IPage<Orders> iPage = baseMapper.selectPage(orderPage, queryWrapper);
|
||||
List<Orders> bean = iPage.getRecords();
|
||||
List<Orders> list = baseMapper.selectList(queryWrapper);
|
||||
PageInfo<Orders> pageInfo = new PageInfo<>(list);
|
||||
List<Orders> bean = pageInfo.getList();
|
||||
if (bean != null && bean.size() > 0) {
|
||||
for (int i = 0; bean.size() > i; i++) {
|
||||
bean.get(i).setCourse(courseDao.selectById(bean.get(i).getCourseId()));
|
||||
}
|
||||
}
|
||||
return Result.success().put("data", iPage);
|
||||
return Result.success().put("data", PageUtils.page(pageInfo, true));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -716,7 +715,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
|
||||
@Override
|
||||
public Result selectOrdersMoneyList(Integer page, Integer limit, Integer flag, String time) {
|
||||
return Result.success().put("data", baseMapper.selectOrdersMoneyList(new Page<>(page, limit), flag, time));
|
||||
PageHelper.startPage(page, limit);
|
||||
List<Orders> orders = baseMapper.selectOrdersMoneyList(flag, time);
|
||||
PageInfo<Orders> pageInfo = new PageInfo<>(orders);
|
||||
return Result.success().put("data", PageUtils.page(pageInfo, true));
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.sqx.modules.sdk.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.sdk.entity.SdkType;
|
||||
|
||||
|
|
@ -17,5 +17,5 @@ public interface SdkTypeService extends IService<SdkType> {
|
|||
|
||||
Result saveSdkType(SdkType sdkType);
|
||||
|
||||
IPage<SdkType> getSdkTypeList(Integer page, Integer limit, SdkType sdkType);
|
||||
PageUtils getSdkTypeList(Integer page, Integer limit, SdkType sdkType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
package com.sqx.modules.sdk.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.sqx.common.utils.DateUtils;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.sdk.dao.SdkTypeDao;
|
||||
import com.sqx.modules.sdk.entity.SdkType;
|
||||
|
|
@ -12,6 +13,7 @@ import com.sqx.modules.sdk.service.SdkTypeService;
|
|||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
@ -39,16 +41,14 @@ public class SdkTypeServiceImpl extends ServiceImpl<SdkTypeDao, SdkType> impleme
|
|||
}
|
||||
|
||||
@Override
|
||||
public IPage<SdkType> getSdkTypeList(Integer page, Integer limit, SdkType sdkType) {
|
||||
Page<SdkType> pages;
|
||||
if (page != null && limit != null) {
|
||||
pages = new Page<>(page, limit);
|
||||
} else {
|
||||
pages = new Page<>();
|
||||
pages.setSize(-1);
|
||||
public PageUtils getSdkTypeList(Integer page, Integer limit, SdkType sdkType) {
|
||||
if (page == null || limit == null) {
|
||||
page = 1;
|
||||
limit = -1;
|
||||
}
|
||||
return baseMapper.selectPage(pages, new QueryWrapper<>(sdkType).orderByDesc("create_time"));
|
||||
|
||||
|
||||
PageHelper.startPage(page, limit);
|
||||
List<SdkType> list = baseMapper.selectList(new QueryWrapper<>(sdkType).orderByDesc("create_time"));
|
||||
PageInfo<SdkType> pageInfo = new PageInfo<>(list);
|
||||
return PageUtils.page(pageInfo, true);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue