From 82161e4fe47d3c75340fede9070738e1141e421c Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 24 Aug 2023 23:38:38 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 28 ++++++++--------------------
1 files changed, 8 insertions(+), 20 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 5557ed3..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())) {
@@ -175,8 +174,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());
@@ -375,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