From 3e838b3685d24cf4fa7293b7df92dab963c73de4 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 16:29:01 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 25 +++++++------------------
1 files changed, 7 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 f3e4529..218b441 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
@@ -117,11 +117,10 @@
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("商品规格现价不能为空");
-// }
+ 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())) {
@@ -374,19 +373,9 @@
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");
-// }
- if (addSku.getLevelOnePrice().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 presentPrice = addSku.getPresentPrice();
+ if (presentPrice.compareTo(BigDecimal.ZERO) < 0) {
+ return new FebsResponse().fail().message("商品规格现价不能小于0");
}
BigDecimal goodsWeight = addSku.getGoodsWeight();
if(BigDecimal.ZERO.compareTo(goodsWeight) > 0){
--
Gitblit v1.9.1