|
@@ -242,15 +242,15 @@ public class SupplierPriceServiceImpl extends ServiceImpl<SupplierPriceMapper, S
|
|
|
BigDecimal productLength = ObjectUtil.defaultIfNull(productInfo.getLength(), BigDecimal.ZERO);
|
|
|
BigDecimal productWidth = ObjectUtil.defaultIfNull(productInfo.getWidth(), BigDecimal.ZERO);
|
|
|
BigDecimal productHeight = ObjectUtil.defaultIfNull(productInfo.getHeight(), BigDecimal.ZERO);
|
|
|
- BigDecimal productVolume = productLength.multiply(productWidth).multiply(productHeight);
|
|
|
+ BigDecimal productVolume = productLength.multiply(productWidth).multiply(productHeight).multiply(BigDecimal.valueOf(1000));
|
|
|
|
|
|
//生成输出实体
|
|
|
SupplierPrice out = new SupplierPrice();
|
|
|
out.setSupplierInfoId(supplierId);
|
|
|
out.setProductInfoId(productInfo.getId());
|
|
|
//产品无属性 原材料价格*长*宽*高
|
|
|
- out.setPrice(price.multiply(productVolume).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
- out.setIncludingTaxPrice(includingTaxPrice.multiply(productVolume).setScale(2, BigDecimal.ROUND_HALF_UP));
|
|
|
+ out.setPrice(price.multiply(productVolume).setScale(4, BigDecimal.ROUND_HALF_UP));
|
|
|
+ out.setIncludingTaxPrice(includingTaxPrice.multiply(productVolume).setScale(4, BigDecimal.ROUND_HALF_UP));
|
|
|
|
|
|
//添加有属性产品价格
|
|
|
outMap.put(productInfo.getId(), out);
|