From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java
index 615c15e..e98741f 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/service/impl/PromotionVideoServiceImpl.java
@@ -2,8 +2,11 @@
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
 import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.promotion.controller.management.dto.MgtPromotionVideoDTO;
 import com.ruoyi.promotion.controller.management.dto.MgtPromotionVideoQuery;
 import com.ruoyi.promotion.controller.management.vo.MgtPromotionVideoVO;
 import com.ruoyi.promotion.mapper.PromotionVideoMapper;
@@ -33,10 +36,25 @@
         Page<PromotionVideo> page = this.lambdaQuery()
                 .like(StringUtils.isNotBlank(query.getVideoName()), PromotionVideo::getVideoName,
                         query.getVideoName())
+                .orderByDesc(PromotionVideo::getCreateTime)
                 .page(new Page<>(query.getPageCurr(), query.getPageSize()));
         if (StringUtils.isEmpty(page.getRecords())) {
             return PageDTO.empty(page);
         }
         return PageDTO.of(page, MgtPromotionVideoVO.class);
     }
+
+    @Override
+    public void saveOrUpdatePromotionVideo(MgtPromotionVideoDTO dto) {
+        PromotionVideo promotionVideo = BeanUtils.copyBean(dto, PromotionVideo.class);
+        if (StringUtils.isNull(dto.getId())) {
+            this.save(promotionVideo);
+        } else {
+            PromotionVideo video = this.getById(dto.getId());
+            if (StringUtils.isNull(video)) {
+                throw new ServiceException("视频不存在");
+            }
+            this.updateById(promotionVideo);
+        }
+    }
 }

--
Gitblit v1.7.1