From b3a60ae2f32f9ef251ecb5f3630472dfd648a11a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 29 Nov 2024 15:00:49 +0800
Subject: [PATCH] refactor(mall): 优化退款金额计算逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/MallNewsInfoServiceImpl.java | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 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 eb93f7e..7e2fbae 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
@@ -2,20 +2,27 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.mall.dto.MallNewsInfoDto;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallNewsCategory;
import cc.mrbird.febs.mall.entity.MallNewsInfo;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
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
@@ -27,7 +34,8 @@
public class MallNewsInfoServiceImpl extends ServiceImpl<MallNewsInfoMapper, MallNewsInfo> implements IMallNewsInfoService {
private final MallNewsCategoryMapper mallNewsCategoryMapper;
-
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+
@Override
public IPage<AdminMallNewsInfoVo> getNewInfoList(MallNewsInfo mallNewsInfo, QueryRequest request) {
Page<AdminMallNewsInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
@@ -37,20 +45,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 +82,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();
}
@@ -114,4 +129,22 @@
public MallNewsCategory findNewsCategoryById(Long id) {
return mallNewsCategoryMapper.selectById(id);
}
+
+ @Override
+ public List<MallNewsCategory> findAllCategory() {
+ return mallNewsCategoryMapper.selectList(null);
+ }
+
+ @Override
+ public FebsResponse addVideoInfo(MallNewsInfoDto mallNewsInfoDto) {
+ DataDictionaryCustom dataDictionaryCustom = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
+ DataDictionaryEnum.VIDEO_URL_INDEX.getType(),
+ DataDictionaryEnum.VIDEO_URL_INDEX.getCode()
+ );
+ if(StrUtil.isNotEmpty(mallNewsInfoDto.getVideoUrl())){
+ dataDictionaryCustom.setValue(mallNewsInfoDto.getVideoUrl());
+ dataDictionaryCustomMapper.updateById(dataDictionaryCustom);
+ }
+ return new FebsResponse().success();
+ }
}
--
Gitblit v1.9.1