From 90fc70c610edae974b9d6e365dd6fbaf93730ff1 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 15 May 2024 15:49:23 +0800
Subject: [PATCH] 测试环境

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 8f4e174..69c9eb2 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
@@ -126,11 +126,11 @@
                     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("商品规格级别价格不能为空");
+//                    }
                     BigDecimal goodsWeight = addSku.getGoodsWeight();
                     if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
                         return new FebsResponse().fail().message("重量不能小于零");
@@ -239,8 +239,8 @@
                 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()));
@@ -554,8 +554,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());
@@ -574,8 +574,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());

--
Gitblit v1.9.1