From ac0dc97b99b5b5bfe71412224bd2c88756c3ec56 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 25 Nov 2024 11:30:20 +0800
Subject: [PATCH] refactor(mall): 调整商品规格价格设置逻辑

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallGoodsService.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 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 c5ef462..10cd251 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
@@ -197,11 +197,11 @@
             sku.setSkuImage(mallGoods.getThumb());
             sku.setSkuName(mallGoods.getGoodsName());
             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.setPresentPrice(new BigDecimal(mallGoods.getPresentPrice()));
+            sku.setLevelOnePrice(new BigDecimal(mallGoods.getPresentPrice()));
+            sku.setLevelTwoPrice(new BigDecimal(mallGoods.getPresentPrice()));
+            sku.setLevelThreePrice(new BigDecimal(mallGoods.getPresentPrice()));
             sku.setSkuVolume(mallGoods.getVolume());
             sku.setStock(mallGoods.getStock());
             sku.setStyleId(style.getId());
@@ -239,13 +239,12 @@
                 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.setCostPrice(addMallGoodsSkuDto.getCostPrice());
 
                 mallGoodsSku.setLevelOnePrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
                 mallGoodsSku.setLevelTwoPrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
                 mallGoodsSku.setLevelThreePrice(new BigDecimal(addMallGoodsSkuDto.getPresentPrice()));
                 mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
-                mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                 mallGoodsSku.setGoodsId(mallGoods.getId());
                 mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
                 mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
@@ -487,9 +486,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(new BigDecimal(mallGoods.getPresentPrice()));
+            sku.setLevelTwoPrice(new BigDecimal(mallGoods.getPresentPrice()));
+            sku.setLevelThreePrice(new BigDecimal(mallGoods.getPresentPrice()));
             sku.setSkuVolume(mallGoods.getVolume());
             sku.setStock(mallGoods.getStock());
             sku.setStyleId(style.getId());
@@ -554,13 +553,12 @@
                         mallGoodsSku.setSkuVolume(addMallGoodsSkuDto.getSkuVolume() == null ? 0 : addMallGoodsSkuDto.getSkuVolume());
                         mallGoodsSku.setOriginalPrice(addMallGoodsSkuDto.getOriginalPrice());
                         mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
-                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getOriginalPrice());
+                        mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                         mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getPresentPrice());
                         mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getPresentPrice());
                         mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getPresentPrice());
                         mallGoodsSku.setStyleId(addMallGoodsSkuDto.getStyleId());
                         mallGoodsSku.setGoodsId(mallGoods.getId());
-                        mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
                         mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
                         mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());
                         mallGoodsSkuMapper.updateById(mallGoodsSku);
@@ -573,13 +571,12 @@
                         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.setStyleId(mallGoodsStyleSku.getId());
+                        mallGoodsSku.setPresentPrice(addMallGoodsSkuDto.getPresentPrice());
                         mallGoodsSku.setCostPrice(addMallGoodsSkuDto.getCostPrice());
+                        mallGoodsSku.setLevelOnePrice(addMallGoodsSkuDto.getPresentPrice());
+                        mallGoodsSku.setLevelTwoPrice(addMallGoodsSkuDto.getPresentPrice());
+                        mallGoodsSku.setLevelThreePrice(addMallGoodsSkuDto.getPresentPrice());
+                        mallGoodsSku.setStyleId(mallGoodsStyleSku.getId());
                         mallGoodsSku.setGoodsId(mallGoods.getId());
                         mallGoodsSku.setGoodsWeight(addMallGoodsSkuDto.getGoodsWeight());
                         mallGoodsSku.setSample(addMallGoodsSkuDto.getSample());

--
Gitblit v1.9.1