diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 2360a5d8..729ea1c8 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -102,8 +102,8 @@ public class CourseCollectServiceImpl extends ServiceImpl courseIPage = baseMapper.selectCourseByCollect( userId,classify); - PageInfo pageInfo = new PageInfo<>(courseIPage); + List courseList = baseMapper.selectCourseByCollect( userId,classify); + PageInfo pageInfo = new PageInfo<>(courseList); List courses = pageInfo.getList(); if (courses != null && courses.size() > 0) { for (Course course : courses) { diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java index 8b7ab0f1..ac225772 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseServiceImpl.java @@ -194,9 +194,9 @@ public class CourseServiceImpl extends ServiceImpl implements setCache(cacheKey, JSONUtil.toJsonStr(pageUtils)); return Result.success().put("data", pageUtils); } - List> mapIPage = baseMapper.selectCourseAdmin(classifyId, title, isRecommend, status, bannerId, + List> list = baseMapper.selectCourseAdmin(classifyId, title, isRecommend, status, bannerId, sort, startTime, endTime, userId, isPrice, over, wxCourse, dyCourse, wxShow, dyShow); - PageInfo> pageInfo = new PageInfo<>(mapIPage); + PageInfo> pageInfo = new PageInfo<>(list); List> records = pageInfo.getList(); for (Map map : records) { map.put("courseDetailsId", null); diff --git a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java index d0cd06b3..a84a069e 100644 --- a/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java +++ b/src/main/java/com/sqx/modules/integral/service/Impl/UserIntegralDetailsServiceImpl.java @@ -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 implements UserIntegralDetailsService { @@ -40,11 +38,11 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl page1 = userIntegralDetailsDao.selectPage(new Page<>(page, limit), new QueryWrapper().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 list = userIntegralDetailsDao.selectList(new QueryWrapper().eq(userId != null, "user_id", userId).orderByDesc("create_time")); + PageInfo pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo, true); } diff --git a/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java b/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java index afbcb9b3..d186cb3b 100644 --- a/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java +++ b/src/main/java/com/sqx/modules/integral/service/UserIntegralDetailsService.java @@ -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 { - IPage selectUserIntegralDetailsByUserId(int page, int limit, Long userId); + PageUtils selectUserIntegralDetailsByUserId(int page, int limit, Long userId); Result signIn(Long userId); diff --git a/src/main/java/com/sqx/modules/invite/dao/InviteDao.java b/src/main/java/com/sqx/modules/invite/dao/InviteDao.java index 3499174e..fdcc4024 100644 --- a/src/main/java/com/sqx/modules/invite/dao/InviteDao.java +++ b/src/main/java/com/sqx/modules/invite/dao/InviteDao.java @@ -26,7 +26,6 @@ public interface InviteDao extends BaseMapper { Double selectInviteSum(@Param("state") Integer state, @Param("userId") Long userId); -// IPage> selectInviteUser(Page> page, @Param("userId") Long userId,@Param("state") Integer state,@Param("userType") Integer userType); List> selectInviteUser(@Param("code") String code); Invite selectInviteByUser(@Param("userId")Long userId,@Param("inviteeUserId") Long inviteeUserId,@Param("userType") Integer userType); diff --git a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java index 50a23cba..8a11fd1f 100644 --- a/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/orders/dao/OrdersDao.java @@ -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 selectOrdersByCourseIdAndUserId(Long userId, Long courseId); - IPage selectOrdersMoneyList(Page page, Integer flag, String time); + List selectOrdersMoneyList(Integer flag, String time); Integer selectOrdersCount(Integer status, Integer ordersType, Integer flag, String time, Long sysUserId); diff --git a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java index e25a839f..b8a7ac30 100644 --- a/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/orders/service/impl/OrdersServiceImpl.java @@ -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 implements @Override public Result selectOrderByUserId(Integer page, Integer limit, Long userId) { - IPage orderPage = new Page<>(page, limit); + PageHelper.startPage(page, limit); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_id", userId); queryWrapper.eq("orders_type", 1); queryWrapper.eq("status", 1); queryWrapper.orderByDesc("create_time"); - IPage iPage = baseMapper.selectPage(orderPage, queryWrapper); - List bean = iPage.getRecords(); + List list = baseMapper.selectList(queryWrapper); + PageInfo pageInfo = new PageInfo<>(list); + List 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 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 = baseMapper.selectOrdersMoneyList(flag, time); + PageInfo pageInfo = new PageInfo<>(orders); + return Result.success().put("data", PageUtils.page(pageInfo, true)); } diff --git a/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.java b/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.java index 850f1c6a..ba00b591 100644 --- a/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.java +++ b/src/main/java/com/sqx/modules/sdk/service/SdkTypeService.java @@ -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 { Result saveSdkType(SdkType sdkType); - IPage getSdkTypeList(Integer page, Integer limit, SdkType sdkType); + PageUtils getSdkTypeList(Integer page, Integer limit, SdkType sdkType); } diff --git a/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java b/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java index 4ba6869e..c995c193 100644 --- a/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java +++ b/src/main/java/com/sqx/modules/sdk/service/impl/SdkTypeServiceImpl.java @@ -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; /** *

@@ -39,16 +41,14 @@ public class SdkTypeServiceImpl extends ServiceImpl impleme } @Override - public IPage getSdkTypeList(Integer page, Integer limit, SdkType sdkType) { - Page 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 list = baseMapper.selectList(new QueryWrapper<>(sdkType).orderByDesc("create_time")); + PageInfo pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo, true); } }