From 4be6aef4c0af3ce178d3d3e3c5f482d837da8045 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期三, 07 八月 2024 19:28:40 +0800
Subject: [PATCH] 计算方式 精度问题解决冲突
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
index 7d633d6..57a64b7 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java
@@ -22,6 +22,8 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@@ -247,7 +249,30 @@
calculateType=orderDetail.getOrder().getCalculateType();
}
double deliveryDetailMoney = 0.0;
+
+ BigDecimal getComputeArea= BigDecimal.valueOf(orderDetail.getComputeArea());
+ BigDecimal getQuantity= BigDecimal.valueOf(orderDetail.getDeliveryDetail().getQuantity());
+ BigDecimal getPrice= BigDecimal.valueOf(orderDetail.getPrice());
+ BigDecimal getWidth= BigDecimal.valueOf(orderDetail.getWidth());
+ BigDecimal getHeight= BigDecimal.valueOf(orderDetail.getHeight());
+ BigDecimal singlePieceArea =getComputeArea.multiply(getQuantity).setScale(2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP);
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
if (calculateType==1){
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+
+ }else if (calculateType==2){
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=getWidth.multiply(getHeight).multiply(getQuantity).divide(BigDecimal.valueOf(1000000), 2, RoundingMode.HALF_UP)
+ .multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+ }else{
+ deliveryDetailMoney=singlePieceArea.doubleValue();
+ }
+ }else if (calculateType==3){
+ deliveryDetailMoney=getQuantity.multiply(getPrice).setScale(2, RoundingMode.HALF_UP).doubleValue();
+
+ }
+ /*if (calculateType==1){
deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
@@ -264,8 +289,8 @@
}else if (calculateType==3){
deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
- }
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ }*/
+
if(orderDetail.getOtherColumns()!="{}"&&orderDetail.getOtherColumns()!=null){
--
Gitblit v1.8.0