From fda57b880c57c2a7e9d26d7912eed310e028042d Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Sat, 03 Jun 2023 03:25:42 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 26 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 2dd07ea..6eb4ae0 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
@@ -3,17 +3,23 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.dto.MallNewsInfoDto;
+import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.mapper.MallNewsCategoryMapper;
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 cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* @author wzy
@@ -23,6 +29,8 @@
@Service
@RequiredArgsConstructor
public class MallNewsInfoServiceImpl extends ServiceImpl<MallNewsInfoMapper, MallNewsInfo> implements IMallNewsInfoService {
+
+ private final MallNewsCategoryMapper mallNewsCategoryMapper;
@Override
public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
@@ -33,20 +41,27 @@
@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());
+// }
+ String content = mallNewsInfoDto.getContent();
+ if(StrUtil.isNotBlank(content)){
+ //正文图片样式居中
+ mallNewsInfoDto.setContent(content+"<style>img{max-width:100%!important;}</style>");
}
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();
}
@@ -67,22 +82,31 @@
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());
+
+ String content = mallNewsInfoDto.getContent();
+ if(StrUtil.isNotBlank(content)){
+ //正文图片样式居中
+ mallNewsInfoDto.setContent(content+"<style>img{max-width:100%!important;}</style>");
}
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();
}
@@ -90,4 +114,39 @@
public MallNewsInfo getNewsInfoById(long id) {
return this.baseMapper.selectById(id);
}
+
+ @Override
+ public IPage<MallNewsCategory> findNewsCategoryInPage(MallNewsCategory mallNewsCategory, QueryRequest request) {
+ 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);
+ }
+
+ @Override
+ public FebsResponse delNewsCategoryInfo(Long id) {
+ MallNewsCategory mallNewsCategory = mallNewsCategoryMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallNewsCategory)){
+ return new FebsResponse().fail().message("系统繁忙，请刷新页面重试");
+ }
+ mallNewsCategoryMapper.deleteById(id);
+ return new FebsResponse().success();
+ }
}
--
Gitblit v1.9.1