From d73ed4025c2be4fa15b22467a29a2a62cdf4b6a3 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 20 May 2025 11:06:04 +0800
Subject: [PATCH] refactor(mall): 移除商品规格级别价格相关代码
---
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java | 53 ++++++++++++++++++++++++++---------------------------
1 files changed, 26 insertions(+), 27 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..6187d7e 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("重量不能小于零");
@@ -200,9 +200,9 @@
sku.setCostPrice(mallGoods.getCostPrice());
sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
- sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
- sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
- sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
+// sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
+// sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+// sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -239,12 +239,11 @@
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.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getLevelOnePrice()));
- mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getLevelTwoPrice()));
- mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getLevelThreePrice()));
+ 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.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
@@ -488,9 +487,9 @@
sku.setCostPrice(mallGoods.getCostPrice());
sku.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
sku.setOriginalPrice(new BigDecimal(mallGoods.getOriginalPrice()));
- sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
- sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
- sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
+// sku.setLevelOnePrice(mallGoods.getLevelOnePrice());
+// sku.setLevelTwoPrice(mallGoods.getLevelTwoPrice());
+// sku.setLevelThreePrice(mallGoods.getLevelThreePrice());
sku.setSkuVolume(mallGoods.getVolume());
sku.setStock(mallGoods.getStock());
sku.setStyleId(style.getId());
@@ -554,11 +553,11 @@
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.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
- mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
- mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
+ mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
+// mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
+// mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+// mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
mallGoodsSku.setGoodsId(mallGoods.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
@@ -574,11 +573,11 @@
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.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
- mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
- mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
+ mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
+// mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
+// mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getLevelOnePrice());
+// mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getLevelTwoPrice());
+// mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getLevelThreePrice());
mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
mallGoodsSku.setGoodsId(mallGoods.getId());
--
Gitblit v1.9.1