From f061da5fea3bdcaf7c585e79100cae20895b284d Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Tue, 28 Oct 2025 16:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=BA=A2=E4=BB=B7=E7=8E=87?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../suisung/mall/common/modules/sync/ProductMapping.java   | 4 ++++
 .../mall/shop/sync/exelModel/ProductMappingExcel.java      | 5 +++++
 .../shop/sync/service/impl/ProductMappingServiceImpl.java  | 7 +++++--
 sql/shop/dev/20251028_dml.sql                              | 1 +
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 sql/shop/dev/20251028_dml.sql

diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductMapping.java b/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductMapping.java
index 822551c0..91aa3bd0 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductMapping.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/sync/ProductMapping.java
@@ -81,6 +81,10 @@ public class ProductMapping implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @TableField(value ="premium_rate",updateStrategy=NOT_EMPTY)
+    @ApiModelProperty("线上溢价率")
+    private BigDecimal premiumRate;
+
 
     /**
      * 生成唯一键：productName + productNumber + storeId
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/exelModel/ProductMappingExcel.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/exelModel/ProductMappingExcel.java
index 39a0e8a4..9c30ec20 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/exelModel/ProductMappingExcel.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/exelModel/ProductMappingExcel.java
@@ -32,6 +32,9 @@ public class ProductMappingExcel {
     @ExcelProperty(value = "排序值", index = 7)
     private Integer sortOrder;
 
+    @ExcelProperty(value = "线上溢价率", index = 8)
+    private BigDecimal premiumRate;
+
     // 转换为实体对象
     public ProductMapping toEntity() {
         ProductMapping entity = new ProductMapping();
@@ -43,6 +46,7 @@ public class ProductMappingExcel {
         entity.setSpecUnit(this.specUnit);
         entity.setDescription(this.description);
         entity.setSortOrder(this.sortOrder);
+        entity.setPremiumRate(this.premiumRate);
         return entity;
     }
 
@@ -57,6 +61,7 @@ public class ProductMappingExcel {
         excel.setSpecUnit(entity.getSpecUnit());
         excel.setDescription(entity.getDescription());
         excel.setSortOrder(entity.getSortOrder());
+        excel.setPremiumRate(entity.getPremiumRate());
         return excel;
     }
 
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 9aaf0c1c..ad421bb7 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
@@ -61,6 +61,7 @@ import javax.validation.ValidationException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -420,8 +421,10 @@ 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[] bigDecimals= ProductPriceCalculator.calculatePriceAndQuantity(base.getUnit_price(),base.getShop_weight(),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]);
             addShopProductSpecItem.setItemQuantity(bigDecimals[1]);
             Integer Spec_item_id = null;
diff --git a/sql/shop/dev/20251028_dml.sql b/sql/shop/dev/20251028_dml.sql
new file mode 100644
index 00000000..7821e4bd
--- /dev/null
+++ b/sql/shop/dev/20251028_dml.sql
@@ -0,0 +1 @@
+ALTER table product_mapping add column premium_rate decimal(18,4) NOT NULL default '100' COMMENT '线上溢价率';
\ No newline at end of file