diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java index e168159d0..0d2ad0440 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/erpspu/SmErpSpuImportDto.java @@ -40,22 +40,22 @@ public class SmErpSpuImportDto { private Integer packageNum; // 装数 @ExcelProperty("进价") - private Integer purchasePrice; // 进价 + private Double purchasePrice; // 进价 @ExcelProperty("零售价") - private Integer retailPrice; // 零售价 + private Double retailPrice; // 零售价 @ExcelProperty("货商") private String supplier; // 货商 @ExcelProperty("促销价") - private Integer promotionPrice; // 促销价 + private Double promotionPrice; // 促销价 @ExcelProperty("商品性质") private String commodityNature; // 商品性质 @ExcelProperty("成本单价") - private Integer costPrice; // 成本单价 + private Double costPrice; // 成本单价 @ExcelProperty("库存上限") private int inventoryUpperLimit; // 库存上限 diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index b45767b8b..fb6cfe0bb 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -44,6 +44,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.*; @@ -644,8 +646,24 @@ public class SmErpSpuServiceImpl extends ServiceImpl