From 68c92dc86cc15ca8d4982a73e7404bd479f2232c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 22 十一月 2022 17:20:28 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
index 33b9652..e13c468 100644
--- a/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/store/impl/StoreInfoServiceImpl.java
@@ -2,21 +2,25 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.store.StoreInfo;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.store.StoreInfoMapper;
+import com.ycl.mapper.video.VideoPointMapper;
import com.ycl.service.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
import com.ycl.vo.store.StoreInfoExcelVo;
+import com.ycl.vo.store.StoreInfoVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -32,14 +36,21 @@
@Slf4j
public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo> implements StoreInfoService {
+ @Resource
+ StoreInfoMapper storeInfoMapper;
+
+ @Resource
+ VideoPointMapper videoPointMapper;
+
+
@Override
- public Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum) {
- Page<StoreInfo> page = new Page<>(pageSize, pageNum);
- LambdaQueryWrapper<StoreInfo> wrapper = new LambdaQueryWrapper<>();
- if (StrUtil.isNotEmpty(keyword)) {
- wrapper.like(StoreInfo::getStoreName, keyword);
- }
- return page(page, wrapper);
+ public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum) {
+ Page<StoreInfo> storeInfoPage = new Page<>();
+ storeInfoPage.setSize(pageSize);
+ storeInfoPage.setCurrent(pageNum);
+ Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword);
+ page.getRecords().forEach(x->x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
+ return page;
}
@Override
--
Gitblit v1.8.0