From a721f2949a80666751ed7390a9ecba97454f140e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 15 Sep 2022 17:48:09 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java |   87 +++++++++++++++++++++++++++++--------------
 1 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
index 76868ad..a8daf2a 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java
@@ -9,6 +9,7 @@
 import cc.mrbird.febs.mall.mapper.MallNewsInfoMapper;
 import cc.mrbird.febs.mall.service.IMallNewsInfoService;
 import cc.mrbird.febs.mall.vo.AdminMallNewsInfoVo;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * @author wzy
@@ -37,20 +40,23 @@
 
     @Override
     public FebsResponse addNewsInfo(MallNewsInfoDto mallNewsInfoDto) {
-        Integer type = mallNewsInfoDto.getType();
-        if(type == 2){
-            Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
-            if(goodsId == 0L){
-                return new FebsResponse().fail().message("请选择跳转的产品");
-            }
-        }
+//        Integer type = mallNewsInfoDto.getType();
+//        if(type == 2){
+//            Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
+//            if(goodsId == 0L){
+//                return new FebsResponse().fail().message("请选择跳转的产品");
+//            }
+//        }
+//        MallNewsInfo mallNewsInfo = new MallNewsInfo();
+//        mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
+//        mallNewsInfo.setContent(mallNewsInfoDto.getContent());
+//        mallNewsInfo.setType(mallNewsInfoDto.getType());
+//        if(mallNewsInfoDto.getType() == 2){
+//            mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
+//        }
+
         MallNewsInfo mallNewsInfo = new MallNewsInfo();
-        mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
-        mallNewsInfo.setContent(mallNewsInfoDto.getContent());
-        mallNewsInfo.setType(mallNewsInfoDto.getType());
-        if(mallNewsInfoDto.getType() == 2){
-            mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
-        }
+        BeanUtil.copyProperties(mallNewsInfoDto, mallNewsInfo);
         this.baseMapper.insert(mallNewsInfo);
         return new FebsResponse().success();
     }
@@ -71,22 +77,26 @@
         if(ObjectUtil.isEmpty(mallNewsInfoBefore)){
             return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
         }
-        Integer type = mallNewsInfoDto.getType();
-        if(type == 2){
-            Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
-            if(goodsId == 0L){
-                return new FebsResponse().fail().message("请选择跳转的产品");
-            }
-        }
+//        Integer type = mallNewsInfoDto.getType();
+//        if(type == 2){
+//            Long goodsId = mallNewsInfoDto.getGoodsId()==null?0L:mallNewsInfoDto.getGoodsId();
+//            if(goodsId == 0L){
+//                return new FebsResponse().fail().message("请选择跳转的产品");
+//            }
+//        }
+//        MallNewsInfo mallNewsInfo = new MallNewsInfo();
+//        mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
+//        mallNewsInfo.setContent(mallNewsInfoDto.getContent());
+//        mallNewsInfo.setType(mallNewsInfoDto.getType());
+//        if(mallNewsInfoDto.getType() == 2){
+//            mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
+//        }
+//        this.baseMapper.insert(mallNewsInfo);
+//        this.baseMapper.deleteById(mallNewsInfoDto.getId());
+
         MallNewsInfo mallNewsInfo = new MallNewsInfo();
-        mallNewsInfo.setTitle(mallNewsInfoDto.getTitle());
-        mallNewsInfo.setContent(mallNewsInfoDto.getContent());
-        mallNewsInfo.setType(mallNewsInfoDto.getType());
-        if(mallNewsInfoDto.getType() == 2){
-            mallNewsInfo.setTargetId(mallNewsInfoDto.getGoodsId());
-        }
-        this.baseMapper.insert(mallNewsInfo);
-        this.baseMapper.deleteById(mallNewsInfoDto.getId());
+        BeanUtil.copyProperties(mallNewsInfoDto, mallNewsInfo);
+        this.baseMapper.updateById(mallNewsInfo);
         return new FebsResponse().success();
     }
 
@@ -97,7 +107,26 @@
 
     @Override
     public IPage<MallNewsCategory> findNewsCategoryInPage(MallNewsCategory mallNewsCategory, QueryRequest request) {
-        Page<MallNewsCategory> page = new Page<>(request.getPageNum(), request.getPageNum());
+        Page<MallNewsCategory> page = new Page<>(request.getPageNum(), request.getPageSize());
         return mallNewsCategoryMapper.selectInPage(mallNewsCategory, page);
     }
+
+    @Override
+    public void addOrModifyNewsCategory(MallNewsCategory mallNewsCategory) {
+        if (mallNewsCategory.getId() != null) {
+            mallNewsCategoryMapper.updateById(mallNewsCategory);
+            return;
+        }
+        mallNewsCategoryMapper.insert(mallNewsCategory);
+    }
+
+    @Override
+    public MallNewsCategory findNewsCategoryById(Long id) {
+        return mallNewsCategoryMapper.selectById(id);
+    }
+
+    @Override
+    public List<MallNewsCategory> findAllCategory() {
+        return mallNewsCategoryMapper.selectList(null);
+    }
 }

--
Gitblit v1.9.1