From ad04c582fbda7f095866d37993143880b57af7a4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 27 Sep 2021 17:36:36 +0800
Subject: [PATCH] 20210927

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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 91b81b4..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
@@ -64,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());
@@ -109,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());

--
Gitblit v1.9.1