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