From ed8b21bb2c3e5d36369576fa36ccfdd7682cf3fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 27 Sep 2021 18:30:15 +0800
Subject: [PATCH] fix ali gatway
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 94 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 15 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..915c5e6 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;
@@ -37,6 +33,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) {
@@ -67,6 +64,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,8 +103,25 @@
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();
if(CollUtil.isNotEmpty(addMallGoodsSkuDtos)){
@@ -95,8 +136,8 @@
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());
@@ -109,8 +150,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 +161,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 +171,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