From 7ff8b16f87269bf995062477a80584d504849ccf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 19:59:49 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 117 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
index b0cd995..379d795 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java
@@ -5,15 +5,11 @@
import cc.mrbird.febs.mall.dto.AddMallGoodsDto;
import cc.mrbird.febs.mall.dto.AddMallGoodsSkuDto;
import cc.mrbird.febs.mall.dto.UpMallGoodsDto;
-import cc.mrbird.febs.mall.entity.MallGoods;
-import cc.mrbird.febs.mall.entity.MallGoodsCategory;
-import cc.mrbird.febs.mall.entity.MallGoodsSku;
-import cc.mrbird.febs.mall.entity.MallGoodsStyle;
-import cc.mrbird.febs.mall.mapper.MallGoodsCategoryMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper;
-import cc.mrbird.febs.mall.mapper.MallGoodsStyleMapper;
+import cc.mrbird.febs.mall.entity.*;
+import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
+import cc.mrbird.febs.mall.vo.AdminMailGoodsDetailVo;
+import cc.mrbird.febs.mall.vo.AdminMailGoodsSkuDetailVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsVo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -24,9 +20,12 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
@Slf4j
@Service
@@ -37,6 +36,7 @@
private final MallGoodsMapper mallGoodsMapper;
private final MallGoodsSkuMapper mallGoodsSkuMapper;
private final MallGoodsStyleMapper mallGoodsStyleMapper;
+ private final MallGoodsImagesMapper mallGoodsImagesMapper;
@Override
public IPage<AdminMallGoodsVo> getCategoryListInPage(MallGoods mallGoods, QueryRequest request) {
@@ -46,6 +46,7 @@
}
@Override
+ @Transactional
public FebsResponse addMallGoods(AddMallGoodsDto addMallGoodsDto) {
String goodsName = addMallGoodsDto.getGoodsName();
if(StrUtil.isEmpty(goodsName)){
@@ -67,6 +68,33 @@
if(ObjectUtil.isEmpty(categoryId)){
return new FebsResponse().fail().message("商品分类不能为空");
}
+ List<AddMallGoodsSkuDto> addSkus = addMallGoodsDto.getAddMallGoodsSkuDtos();
+ if(CollUtil.isEmpty(addSkus)){
+ return new FebsResponse().fail().message("商品规格不能为空");
+ }
+ for(AddMallGoodsSkuDto addSku : addSkus){
+ String skuName = addSku.getSkuName();
+ if(StrUtil.isEmpty(skuName)){
+ return new FebsResponse().fail().message("商品规格名称不能为空");
+ }
+ Integer skuVolume = addSku.getSkuVolume()==null?0: addSku.getSkuVolume();
+ if(skuVolume < 0){
+ return new FebsResponse().fail().message("商品规格销售数量不能小于0");
+ }
+ Integer stock = addSku.getStock()==null?0: addSku.getStock();
+ if(stock < 0){
+ return new FebsResponse().fail().message("商品规格库存必须大于0");
+ }
+ String originalPrice = addSku.getOriginalPrice();
+ if(StrUtil.isEmpty(originalPrice)){
+ return new FebsResponse().fail().message("商品规格原价不能为空");
+ }
+ String presentPrice = addSku.getPresentPrice();
+ if(StrUtil.isEmpty(presentPrice)){
+ return new FebsResponse().fail().message("商品规格现价不能为空");
+ }
+
+ }
//新增商品
MallGoods mallGoods = new MallGoods();
mallGoods.setGoodsNo(addMallGoodsDto.getGoodsNo());
@@ -79,27 +107,57 @@
mallGoods.setCategoryId(addMallGoodsDto.getCategoryId());
mallGoods.setPresentPrice(addMallGoodsDto.getPresentPrice());
mallGoods.setIsHot(addMallGoodsDto.getIsHot());
- mallGoods.setIsSale(2);
+ mallGoods.setIsSale(MallGoods.ISSALE_STATUS_DISABLED);
mallGoodsMapper.insert(mallGoods);
+ String thumbs = addMallGoodsDto.getThumbs();
+ if(StrUtil.isNotEmpty(thumbs)){
+ List<String> imgs = StrUtil.splitTrim(thumbs, ",");
+ if(CollUtil.isNotEmpty(imgs)){
+ int i = 1;
+ for(String img : imgs){
+ MallGoodsImages mallGoodsImages = new MallGoodsImages();
+ mallGoodsImages.setGoodsId(mallGoods.getId());
+ mallGoodsImages.setImageUrl(img);
+ mallGoodsImages.setSeq(i);
+ mallGoodsImagesMapper.insert(mallGoodsImages);
+ i++;
+ }
+ }
+ }
+
+
+
List<AddMallGoodsSkuDto> addMallGoodsSkuDtos = addMallGoodsDto.getAddMallGoodsSkuDtos();
+ Set<String> styles = new HashSet<>();
if(CollUtil.isNotEmpty(addMallGoodsSkuDtos)){
- for(AddMallGoodsSkuDto addMallGoodsSkuDto : addMallGoodsSkuDtos){
+ for(AddMallGoodsSkuDto addStyleDto : addMallGoodsSkuDtos){
+ styles.add(addStyleDto.getStyleName());
+ }
+ }
+ if(CollUtil.isNotEmpty(styles)){
+ for(String style : styles){
//新增样式
MallGoodsStyle mallGoodsStyle = new MallGoodsStyle();
- mallGoodsStyle.setName(addMallGoodsSkuDto.getSkuName());
+ mallGoodsStyle.setName(style);
mallGoodsStyle.setGoodsId(mallGoods.getId());
mallGoodsStyleMapper.insert(mallGoodsStyle);
+ }
+ }
+
+ if(CollUtil.isNotEmpty(addMallGoodsSkuDtos)){
+ for(AddMallGoodsSkuDto addMallGoodsSkuDto : addMallGoodsSkuDtos){
+ MallGoodsStyle mallGoodsStyleSku = mallGoodsStyleMapper.selectByStyleName(addMallGoodsSkuDto.getStyleName(),mallGoods.getId());
//新增商品规格
MallGoodsSku mallGoodsSku = new MallGoodsSku();
mallGoodsSku.setSkuName(addMallGoodsSkuDto.getSkuName());
mallGoodsSku.setSkuImage(addMallGoodsSkuDto.getSkuImage());
- mallGoodsSku.setStock(addMallGoodsSkuDto.getStock());
- mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume());
+ mallGoodsSku.setStock(addMallGoodsSkuDto.getStock()==null?0:addMallGoodsSkuDto.getStock());
+ mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume()==null?0:addMallGoodsSkuDto.getSkuVolume());
mallGoodsSku.setOriginalPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));
mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
- mallGoodsSku.setStyleId(mallGoodsStyle.getId());
+ mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSkuMapper.insert(mallGoodsSku);
}
@@ -109,8 +167,7 @@
}
@Override
- public FebsResponse upMallGoods(UpMallGoodsDto upMallGoodsDto) {
- Long id = upMallGoodsDto.getId();
+ public FebsResponse upMallGoods(Long id) {
MallGoods mallGoods = mallGoodsMapper.selectById(id);
if(ObjectUtil.isEmpty(mallGoods)){
return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
@@ -121,8 +178,7 @@
}
@Override
- public FebsResponse downMallGoods(UpMallGoodsDto upMallGoodsDto) {
- Long id = upMallGoodsDto.getId();
+ public FebsResponse downMallGoods(Long id) {
MallGoods mallGoods = mallGoodsMapper.selectById(id);
if(ObjectUtil.isEmpty(mallGoods)){
return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
@@ -132,5 +188,30 @@
return new FebsResponse().success();
}
+ @Override
+ public FebsResponse delMallGoods(Long id) {
+ MallGoods mallGoods = mallGoodsMapper.selectById(id);
+ if(ObjectUtil.isEmpty(mallGoods)){
+ return new FebsResponse().fail().message("商品不存在，请刷新当前页面");
+ }
+ Integer isSale = mallGoods.getIsSale();
+ if(MallGoods.ISSALE_STATUS_DISABLED != isSale){
+ return new FebsResponse().fail().message("请先下架该商品");
+ }
+
+ mallGoodsStyleMapper.deleteByGoodsId(id);
+ mallGoodsSkuMapper.deleteByGoodsId(id);
+ mallGoodsMapper.deleteById(mallGoods);
+ return new FebsResponse().success();
+ }
+
+ @Override
+ public AdminMailGoodsDetailVo getMallGoodsInfoById(long id) {
+ AdminMailGoodsDetailVo adminMailGoodsDetailVo = mallGoodsMapper.selectMallGoodsInfoById(id);
+ List<AdminMailGoodsSkuDetailVo> adminMailGoodsSkuDetailVos = mallGoodsSkuMapper.selectByGoodId(id);
+ adminMailGoodsDetailVo.setMailGoodsSkuDetailVo(adminMailGoodsSkuDetailVos);
+ return adminMailGoodsDetailVo;
+ }
+
}
--
Gitblit v1.9.1