From 43fa0ec4dc02c2bb1a2ac5e9eea81cae4d2cb11d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Dec 2021 16:08:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-video

---
 src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
index 6dc4dd2..e60f7a7 100644
--- a/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/video/service/impl/VideoMasterInfoServiceImpl.java
@@ -8,6 +8,7 @@
 import cc.mrbird.febs.video.conversion.VideoConversion;
 import cc.mrbird.febs.video.conversion.VideoMemberConversion;
 import cc.mrbird.febs.video.dto.ApiVideoCollectionDto;
+import cc.mrbird.febs.video.dto.ApiVideoHistoryDto;
 import cc.mrbird.febs.video.dto.ApiVideoLikeDto;
 import cc.mrbird.febs.video.dto.VideoListDto;
 import cc.mrbird.febs.video.entity.*;
@@ -45,6 +46,7 @@
     private final VideoCollectionMapper videoCollectionMapper;
     private final VideoCommentInfoMapper videoCommentInfoMapper;
     private final VideoCommentLikeMapper videoCommentLikeMapper;
+    private final VideoHistoryMapper videoHistoryMapper;
     private final VideoMemberMapper videoMemberMapper;
 
     @Override
@@ -254,7 +256,7 @@
                 //点赞数-1
                 VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(relateId);
                 int starCnt = videoMasterDataEntity.getStarCnt();
-                videoMasterDataEntity.setCollectCnt((starCnt - 1) <= 0 ? 0:(starCnt - 1));
+                videoMasterDataEntity.setStarCnt((starCnt - 1) <= 0 ? 0:(starCnt - 1));
                 videoMasterDataMapper.updateById(videoMasterDataEntity);
                 return new FebsResponse().success().message("已取消点赞");
             }else if(2 == type){
@@ -277,10 +279,19 @@
             //点赞数+1
             VideoMasterDataEntity videoMasterDataEntity = videoMasterDataMapper.selectDataByMasterId(relateId);
             int starCnt = videoMasterDataEntity.getStarCnt();
-            videoMasterDataEntity.setCollectCnt((starCnt + 1) <= 0 ? 0:(starCnt + 1));
+            videoMasterDataEntity.setStarCnt((starCnt + 1) <= 0 ? 0:(starCnt + 1));
             videoMasterDataMapper.updateById(videoMasterDataEntity);
             return new FebsResponse().success().message("已点赞");
         }
 
     }
+
+    @Override
+    public FebsResponse delVideoHistory(ApiVideoHistoryDto apiVideoHistoryDto) {
+        Long id = LoginUserUtil.getLoginUser().getId();
+        String ids = apiVideoHistoryDto.getIds();
+        List<String> idList = StrUtil.split(ids, ',');
+        videoHistoryMapper.delVideoHistoryByIdsAndMemberId(idList,id);
+        return new FebsResponse().success().message("成功");
+    }
 }

--
Gitblit v1.9.1