From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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, 20 insertions(+), 5 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 e13c468..79b05f0 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
@@ -6,9 +6,11 @@
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.entity.store.StoreScore;
import com.ycl.enums.common.ResultCode;
import com.ycl.exception.ApiException;
import com.ycl.mapper.store.StoreInfoMapper;
+import com.ycl.mapper.store.StoreScoreMapper;
import com.ycl.mapper.video.VideoPointMapper;
import com.ycl.service.store.StoreInfoService;
import com.ycl.utils.ExcelUtils;
@@ -42,14 +44,17 @@
@Resource
VideoPointMapper videoPointMapper;
+ @Resource
+ StoreScoreMapper storeScoreMapper;
+
@Override
- public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum) {
+ public Page<StoreInfoVO> list(String keyword, Integer pageSize, Integer pageNum,String status) {
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())));
+ Page<StoreInfoVO> page = storeInfoMapper.selectStorePage(storeInfoPage, keyword,status);
+ page.getRecords().forEach(x -> x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
return page;
}
@@ -69,14 +74,24 @@
List<StoreInfo> infos = new ArrayList<>();
for (StoreInfoExcelVo data : datas) {
StoreInfo info = new StoreInfo();
- BeanUtils.copyProperties(data,info);
+ BeanUtils.copyProperties(data, info);
infos.add(info);
}
- BeanUtils.copyProperties(datas,infos);
+ BeanUtils.copyProperties(datas, infos);
saveBatch(infos);
return true;
} catch (Exception e) {
throw new ApiException(ResultCode.FAILED);
}
}
+
+ @Override
+ public Page<StoreScore> getScoreList(Long storeId, Integer pageSize, Integer pageNum) {
+ Page<StoreScore> storeScorePage = new Page<>();
+ storeScorePage.setSize(pageSize);
+ storeScorePage.setCurrent(pageNum);
+ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<StoreScore>().eq(StoreScore::getStoreId, storeId);
+ Page<StoreScore> page = storeScoreMapper.selectPage(storeScorePage, queryWrapper);
+ return page;
+ }
}
--
Gitblit v1.8.0