This commit is contained in:
wangw 2025-01-02 20:59:32 +08:00
parent e8a986e476
commit 2025b4c397
9 changed files with 25 additions and 40 deletions

View File

@ -1,6 +1,5 @@
package com.sqx.common.utils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.pagehelper.PageInfo;
import java.io.Serializable;
@ -53,17 +52,6 @@ public class PageUtils implements Serializable {
this.totalPage = (int) Math.ceil((double) totalCount / pageSize);
}
/**
* 分页
*/
public PageUtils(IPage<?> page) {
this.list = page.getRecords();
this.totalCount = (int) page.getTotal();
this.pageSize = (int) page.getSize();
this.currPage = (int) page.getCurrent();
this.totalPage = (int) page.getPages();
}
public static PageUtils page(PageInfo<?> page) {
return page(page,false);
}

View File

@ -1,8 +1,6 @@
package com.sqx.modules.app.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.app.entity.UserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -37,7 +35,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
int insertUser(UserEntity userEntity);
IPage<UserEntity> selectInviteUserList(Page<UserEntity> page,String userName,String phone);
List<UserEntity> selectInviteUserList(String userName,String phone);
int selectUserOnLineCount(String qdCode);

View File

@ -1477,7 +1477,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
@Override
public Result selectInviteUserList(Integer page, Integer limit, String userName, String phone) {
return Result.success().put("data", baseMapper.selectInviteUserList(new Page<>(page, limit), userName, phone));
PageHelper.startPage(page,limit);
return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectInviteUserList(userName, phone)),true));
}
@Override

View File

@ -1,9 +1,8 @@
package com.sqx.modules.coupon.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.sqx.common.utils.Result;
import com.sqx.modules.coupon.dao.CouponDao;
import com.sqx.modules.coupon.entity.Coupon;
@ -34,13 +33,12 @@ public class CouponServiceImpl extends ServiceImpl<CouponDao, Coupon> implements
@Override
public Result selectCoupon(Integer page, Integer limit, String couponName) {
IPage<Coupon> pages = new Page<>(page, limit);
PageHelper.startPage(page,limit);
QueryWrapper<Coupon> queryWrapper1 = new QueryWrapper<>();
if(couponName!=null){
queryWrapper1.eq("coupon_name",couponName);
}
pages=baseMapper.selectPage(pages,queryWrapper1);
return Result.success().put("data",pages.getRecords());
return Result.success().put("data",baseMapper.selectList(queryWrapper1));
}
@Override

View File

@ -1,8 +1,6 @@
package com.sqx.modules.course.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.course.entity.Course;
import com.sqx.modules.course.entity.CourseCollect;
import org.apache.ibatis.annotations.Mapper;

View File

@ -180,9 +180,9 @@ public class CourseServiceImpl extends ServiceImpl<CourseDao, Course> implements
PageHelper.startPage(page, limit);
if (admin == null) {
List<Map<String, Object>> mapIPage = baseMapper.selectCourse(classifyId, title, isRecommend, status, bannerId,
List<Map<String, Object>> map = baseMapper.selectCourse(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<>(map);
List<Map<String, Object>> records = pageInfo.getList();
for (Map<String, Object> map : records) {
map.put("courseDetailsId", null);

View File

@ -21,7 +21,10 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@Service
public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDetailsDao, UserIntegralDetails> implements UserIntegralDetailsService {
@ -39,10 +42,11 @@ public class UserIntegralDetailsServiceImpl extends ServiceImpl<UserIntegralDeta
@Override
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);
PageHelper.startPage(page,limit);
return PageUtils.page(new PageInfo<>(userIntegralDetailsDao.selectList(
new QueryWrapper<UserIntegralDetails>()
.eq(userId != null, "user_id", userId)
.orderByDesc("create_time"))),true);
}

View File

@ -715,10 +715,8 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
@Override
public Result selectOrdersMoneyList(Integer page, Integer limit, Integer flag, String 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));
PageHelper.startPage(page,limit);
return Result.success().put("data", PageUtils.page(new PageInfo<>(baseMapper.selectOrdersMoneyList( flag, time)),true));
}

View File

@ -13,7 +13,6 @@ import com.sqx.modules.sdk.service.SdkTypeService;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
/**
* <p>
@ -42,13 +41,14 @@ public class SdkTypeServiceImpl extends ServiceImpl<SdkTypeDao, SdkType> impleme
@Override
public PageUtils getSdkTypeList(Integer page, Integer limit, SdkType sdkType) {
if (page == null || limit == null) {
page = 1;
limit = -1;
limit = 10;
}
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);
PageHelper.startPage(page,limit);
return PageUtils.page(new PageInfo<>(baseMapper.selectList(new QueryWrapper<>(sdkType).orderByDesc("create_time"))),true);
}
}