足迹分页相关问题处理

buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java

@@ -5,6 +5,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.service.FootprintService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +35,7 @@ public class FootprintController {
 
     @ApiOperation(value = "分页获取")
     @GetMapping
-    public ResultMessage<List<EsGoodsIndex>> getByPage(PageVO page) {
+    public ResultMessage<IPage<EsGoodsIndex>> getByPage(PageVO page) {
         return ResultUtil.data(footprintService.footPrintPage(page));
     }
 

framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java

@@ -18,17 +18,6 @@ import java.util.List;
  * @since 2020-02-25 14:10:16
  */
 public interface FootprintMapper extends BaseMapper<FootPrint> {
-
-    /**
-     * 获取用户足迹的SkuId分页
-     *
-     * @param page         分页
-     * @param queryWrapper 查询条件
-     * @return 用户足迹的SkuId分页
-     */
-    @Select("select sku_id from li_foot_print  ${ew.customSqlSegment} ")
-    List<String> footprintSkuIdList(IPage<String> page, @Param(Constants.WRAPPER) Wrapper<FootPrint> queryWrapper);
-
     /**
      * 删除超过100条后的记录
      *

framework/src/main/java/cn/lili/modules/member/service/FootprintService.java

@@ -3,6 +3,7 @@ package cn.lili.modules.member.service;
 import cn.lili.common.vo.PageVO;
 import cn.lili.modules.member.entity.dos.FootPrint;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -44,7 +45,7 @@ public interface FootprintService extends IService<FootPrint> {
      * @param pageVO 分页
      * @return 会员浏览历史列表
      */
-    List<EsGoodsIndex> footPrintPage(PageVO pageVO);
+    IPage<EsGoodsIndex> footPrintPage(PageVO pageVO);
 
     /**
      * 获取当前会员的浏览记录数量

framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java

@@ -9,7 +9,9 @@ import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.service.EsGoodsSearchService;
 import cn.lili.mybatis.util.PageUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,6 +21,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * 会员浏览历史业务层实现
@@ -29,9 +32,7 @@ import java.util.Objects;
 @Service
 public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint> implements FootprintService {
 
-    /**
-     * es商品业务层
-     */
+
     @Autowired
     private EsGoodsSearchService esGoodsSearchService;
 
@@ -74,20 +75,35 @@ public class FootprintServiceImpl extends ServiceImpl<FootprintMapper, FootPrint
     }
 
     @Override
-    public List<EsGoodsIndex> footPrintPage(PageVO pageVO) {
+    public IPage<EsGoodsIndex> footPrintPage(PageVO pageVO) {
 
         LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
         lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
-        lambdaQueryWrapper.orderByDesc(FootPrint::getUpdateTime);
-        List<String> skuIdList = this.baseMapper.footprintSkuIdList(PageUtil.initPage(pageVO), lambdaQueryWrapper);
-        if (!skuIdList.isEmpty()) {
-            List<EsGoodsIndex> list = esGoodsSearchService.getEsGoodsBySkuIds(skuIdList);
+        lambdaQueryWrapper.orderByDesc(FootPrint::getCreateTime);
+        IPage<FootPrint> footPrintPages = this.page(PageUtil.initPage(pageVO), lambdaQueryWrapper);
+
+
+        //定义结果
+        IPage<EsGoodsIndex> esGoodsIndexIPage = new Page<EsGoodsIndex>();
+
+        if (footPrintPages.getRecords() == null || footPrintPages.getRecords().isEmpty()) {
+            return esGoodsIndexIPage;
+        } else {
+            List<EsGoodsIndex> list = esGoodsSearchService.getEsGoodsBySkuIds(
+                    footPrintPages.getRecords().stream().map(item -> {
+                        return item.getSkuId();
+                    }).collect(Collectors.toList()));
             //去除为空的商品数据
             list.removeIf(Objects::isNull);
-            return list;
+
+            esGoodsIndexIPage.setPages(footPrintPages.getPages());
+            esGoodsIndexIPage.setRecords(list);
+            esGoodsIndexIPage.setTotal(footPrintPages.getTotal());
+            esGoodsIndexIPage.setSize(footPrintPages.getSize());
+            esGoodsIndexIPage.setCurrent(footPrintPages.getCurrent());
+            return esGoodsIndexIPage;
         }
-        return Collections.emptyList();
     }
 
     @Override