From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 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 bd15859..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,12 +6,16 @@
 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;
 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;
@@ -34,16 +38,24 @@
 @Slf4j
 public class StoreInfoServiceImpl extends ServiceImpl<StoreInfoMapper, StoreInfo> implements StoreInfoService {
 
+    @Resource
+    StoreInfoMapper storeInfoMapper;
+
+    @Resource
+    VideoPointMapper videoPointMapper;
+
+    @Resource
+    StoreScoreMapper storeScoreMapper;
 
 
     @Override
-    public Page<StoreInfo> list(String keyword, Integer pageSize, Integer pageNum) {
-        Page<StoreInfo> page = new Page<>(pageSize, pageNum);
-        Page<StoreInfo> storeInfoPage = page(page, new LambdaQueryWrapper<StoreInfo>()
-                .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword));
-        storeInfoPage.setRecords(list(new LambdaQueryWrapper<StoreInfo>()
-                .like(StringUtils.isNotBlank(keyword), StoreInfo::getStoreName, keyword)));
-        return storeInfoPage;
+    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,status);
+        page.getRecords().forEach(x -> x.setVideoPoint(videoPointMapper.selectById(x.getVideoId())));
+        return page;
     }
 
     @Override
@@ -62,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