商城商品修改

xiaoyong931011

2023-07-20 8718ab2d5056bc5c48ce53871239db7f582290c1

 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java

@@ -117,15 +117,18 @@
                    if (StrUtil.isEmpty(originalPrice)) {
                        return new FebsResponse().fail().message("商品规格原价不能为空");
                    }
                    addSku.setPresentPrice(addSku.getOriginalPrice());
//                    String presentPrice = addSku.getPresentPrice();
//                    if (StrUtil.isEmpty(presentPrice)) {
//                        return new FebsResponse().fail().message("商品规格现价不能为空");
//                    addSku.setPresentPrice(addSku.getOriginalPrice());
                    String presentPrice = addSku.getPresentPrice();
                    if (StrUtil.isEmpty(presentPrice)) {
                        return new FebsResponse().fail().message("商品规格现价不能为空");
                    }
//                    if (StrUtil.isEmpty(addSku.getLevelOnePrice())
//                    || StrUtil.isEmpty(addSku.getLevelTwoPrice())
//                            || StrUtil.isEmpty(addSku.getLevelThreePrice())) {
//                        return new FebsResponse().fail().message("商品规格级别价格不能为空");
//                    }
                    if (StrUtil.isEmpty(addSku.getLevelOnePrice())
                    || StrUtil.isEmpty(addSku.getLevelTwoPrice())
                            || StrUtil.isEmpty(addSku.getLevelThreePrice())) {
                        return new FebsResponse().fail().message("商品规格级别价格不能为空");
                    if (StrUtil.isEmpty(addSku.getLevelOnePrice())) {
                        return new FebsResponse().fail().message("商品规格赠送积分不能为空");
                    }
                    BigDecimal goodsWeight = addSku.getGoodsWeight();
                    if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
@@ -175,8 +178,7 @@
            sku.setSkuImage(mallGoods.getThumb());
            sku.setSkuName(mallGoods.getGoodsName());
            sku.setCostPrice(mallGoods.getCostPrice());
//            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
            sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
            sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
            sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
@@ -217,12 +219,12 @@
                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.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));
                mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
//                mallGoodsSku.setPresentPrice(new BigDecimal(addMallGoodsSkuDto.getOriginalPrice()));

                mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getLevelOnePrice()));
                mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));
                mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice()));
//                mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));
//                mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice()));
                mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
                mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -375,20 +377,20 @@
                    if (originalPrice.compareTo(BigDecimal.ZERO) <= 0) {
                        return new FebsResponse().fail().message("商品规格原价不能小于0");
                    }
                    addSku.setPresentPrice(addSku.getOriginalPrice());
//                    BigDecimal presentPrice = addSku.getPresentPrice();
//                    if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
//                        return new FebsResponse().fail().message("商品规格现价不能小于0");
//                    }
//                    addSku.setPresentPrice(addSku.getOriginalPrice());
                    BigDecimal presentPrice = addSku.getPresentPrice();
                    if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
                        return new FebsResponse().fail().message("商品规格现价不能小于0");
                    }
                    if (addSku.getLevelOnePrice().compareTo(BigDecimal.ZERO) < 0) {
                        return new FebsResponse().fail().message("商品等级价格不能小于0");
                        return new FebsResponse().fail().message("商品规格赠送积分不能小于0");
                    }
                    if (addSku.getLevelTwoPrice().compareTo(BigDecimal.ZERO) < 0) {
                        return new FebsResponse().fail().message("商品等级价格不能小于0");
                    }
                    if (addSku.getLevelThreePrice().compareTo(BigDecimal.ZERO) < 0) {
                        return new FebsResponse().fail().message("商品等级价格不能小于0");
                    }
//                    if (addSku.getLevelTwoPrice().compareTo(BigDecimal.ZERO) < 0) {
//                        return new FebsResponse().fail().message("商品等级价格不能小于0");
//                    }
//                    if (addSku.getLevelThreePrice().compareTo(BigDecimal.ZERO) < 0) {
//                        return new FebsResponse().fail().message("商品等级价格不能小于0");
//                    }
                    BigDecimal goodsWeight = addSku.getGoodsWeight();
                    if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
                        return new FebsResponse().fail().message("重量不能小于零");
@@ -453,8 +455,8 @@
            sku.setSkuImage(mallGoods.getThumb());
            sku.setSkuName(mallGoods.getGoodsName());
            sku.setCostPrice(mallGoods.getCostPrice());
//            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
            sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
//            sku.setPresentPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
            sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
            sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
@@ -522,8 +524,8 @@
                        mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock());
                        mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
                        mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
//                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
//                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
@@ -542,8 +544,8 @@
                        mallGoodsSku.setStock(addMallGoodsSkuDto.getStock() == null ? 0 : addMallGoodsSkuDto.getStock());
                        mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
                        mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
//                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
//                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());