From cd0a5e603bcef28e7d70e5b26ef2d566b698a5a1 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 20 Mar 2025 14:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/erpspu/SmErpSpuImportDto.java         |  8 +++----
 .../service/impl/SmErpSpuServiceImpl.java     | 22 +++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

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<SmErpSpuMapper, SmErpSpuEnt
                 // 处理单位数据
                 SmErpUnitEntity unit = new SmErpUnitEntity();
                 org.springframework.beans.BeanUtils.copyProperties(dto, unit);
-                unit.setPurchasePrice(dto.getPurchasePrice()*100);
-                unit.setRetailPrice(dto.getRetailPrice()*100);
+                unit.setPurchasePrice( BigDecimal.valueOf(dto.getPurchasePrice())
+                        .multiply(BigDecimal.valueOf(100))
+                        .setScale(0, RoundingMode.HALF_UP) // 四舍五入
+                        .intValueExact());
+                unit.setRetailPrice(
+                        BigDecimal.valueOf(dto.getRetailPrice())
+                                .multiply(BigDecimal.valueOf(100))
+                                .setScale(0, RoundingMode.HALF_UP)
+                                .intValueExact()
+                );
+                unit.setPromotionPrice(BigDecimal.valueOf(dto.getPromotionPrice())
+                        .multiply(BigDecimal.valueOf(100))
+                        .setScale(0, RoundingMode.HALF_UP)
+                        .intValueExact());
+                unit.setCostPrice(BigDecimal.valueOf(dto.getCostPrice())
+                        .multiply(BigDecimal.valueOf(100))
+                        .setScale(0, RoundingMode.HALF_UP)
+                        .intValueExact());
                 unit.setSpuId(spu.getId());
                 unit.setIsBase(true);
                 unitBatch.add(unit);