From 3c067f4233c6387d3517584991ce6c1cdd3064a0 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Tue, 28 Oct 2025 18:26:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=A0=E5=B0=84=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E4=BB=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/modules/product/ShopProductSpecItem.java |  4 ++++
 .../service/impl/ProductMappingServiceImpl.java     | 13 ++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductSpecItem.java b/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductSpecItem.java
index ad69328d..d8de855e 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductSpecItem.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductSpecItem.java
@@ -56,6 +56,10 @@ public class ShopProductSpecItem implements Serializable {
     @TableField(exist=false)
     private BigDecimal itemPrice;
 
+    @ApiModelProperty(value = "市场价")
+    @TableField(exist=false)
+    private BigDecimal marketPrice;
+
     @ApiModelProperty(value = "切割后的库存")
     @TableField(exist=false)
     private BigDecimal itemQuantity;
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
index 974ce5e8..e3847523 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
@@ -251,9 +251,10 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
                 }
                 shopProductItems.get(i).setItem_is_default(1);
                 if(shopProductSpecItem.isUpdate()){
-                    shopProductBaseList.get(i).setProduct_unit_price(shopProductSpecItem.getItemPrice());
                     updateShopProductSpecItemList.add(shopProductSpecItem);
                 }
+                shopProductBaseList.get(i).setProduct_unit_price(shopProductSpecItem.getItemPrice());
+                shopProductBaseList.get(i).setProduct_market_price(shopProductSpecItem.getMarketPrice());
 //                else {
 //                    shopProductBaseList.get(i).setProduct_unit_price(shopProductSpecItem.getItemPrice());
 //                    shopProductBaseList.get(i).setProduct_market_price(shopProductSpecItem.getItemPrice());
@@ -421,11 +422,13 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
             ProductMapping productMapping= (ProductMapping) productMappingMap.get(productNumber);
             //String Spec_item_name=productMapping.getProductName()+ BigDecimalFormatter.formatWithoutTrailingZeros(productMapping.getSpecValue())+productMapping.getSpecUnit();
             String Spec_item_name=BigDecimalFormatter.formatWithoutTrailingZeros(productMapping.getSpecValue())+productMapping.getSpecUnit();
-            BigDecimal premiumRate= new BigDecimal("100").add(productMapping.getPremiumRate()).divide(new BigDecimal("100"),2,RoundingMode.HALF_UP);
-            BigDecimal unitPrice=base.getUnit_price().multiply(premiumRate).setScale(2, RoundingMode.HALF_UP);
+
             //计算价格
-            BigDecimal[] bigDecimals= ProductPriceCalculator.calculatePriceAndQuantity(unitPrice,base.getShop_weight(),productMapping.getSpecValue(),productMapping.getSpecUnit());
-            addShopProductSpecItem.setItemPrice(bigDecimals[0]);
+            BigDecimal premiumRate= new BigDecimal("100").add(productMapping.getPremiumRate()).divide(new BigDecimal("100"),2,RoundingMode.HALF_UP);
+            BigDecimal[] bigDecimals= ProductPriceCalculator.calculatePriceAndQuantity(base.getUnit_price(),base.getShop_weight(),productMapping.getSpecValue(),productMapping.getSpecUnit());
+            BigDecimal itemPrice=bigDecimals[0].multiply(premiumRate).setScale(2, RoundingMode.HALF_UP);
+            addShopProductSpecItem.setItemPrice(itemPrice);
+            addShopProductSpecItem.setMarketPrice(bigDecimals[0]);
             addShopProductSpecItem.setItemQuantity(bigDecimals[1]);
             Integer Spec_item_id = null;
             addShopProductSpecItem.setUpdate(true);