From d61ac67e37290019e5ead92f034cdfe1b5a433a9 Mon Sep 17 00:00:00 2001
From: 你好啊 <1536384743@qq.com>
Date: 星期三, 07 八月 2024 17:06:45 +0800
Subject: [PATCH] 小片页面添加弧长字段
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 a062019..7d633d6 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
@@ -232,10 +232,12 @@
deliveryOtherMoney.setQuantity(0.0);
});
double otherMoneys=0.0;
+
List <Map<String, Object>> moneryList=new ArrayList<Map<String, Object>>();//鏈�缁堢粨鏋�
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
+ double deliveryDetailotherMoneys=0.0;
Integer calculateType=0;
if (orderDetail.getOrder().getOrderId()==null){
@@ -246,15 +248,21 @@
}
double deliveryDetailMoney = 0.0;
if (calculateType==1){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
)*orderDetail.getPrice()));
}else if (calculateType==2){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
- String.format("%.2f", orderDetail.getComputeGrossArea()/orderDetail.getQuantity()*orderDetail.getDeliveryDetail().getQuantity())
- )*orderDetail.getPrice()));
+ if(Objects.equals(orderDetail.getArea(), orderDetail.getComputeArea())){
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getWidth()*orderDetail.getHeight()*orderDetail.getDeliveryDetail().getQuantity()/1000000)
+ )*orderDetail.getPrice()));
+ }else{
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",Double.parseDouble(
+ String.format("%.2f", orderDetail.getComputeArea()*orderDetail.getDeliveryDetail().getQuantity())
+ )*orderDetail.getPrice()));
+ }
}else if (calculateType==3){
- deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
+ deliveryDetailMoney=Double.parseDouble(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
}
//鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
@@ -269,6 +277,7 @@
Map<String, Object> deliveryDetailOtherMoney = deliveryDetailMapper.getSelectOrderotherMoney(orderDetail.getOrderId(),orderDetail.getOrderNumber(), key, jsonObject.get(key).toString());
if(deliveryDetailOtherMoney.get("monery")!=null){
otherMoneys=otherMoneys+Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
+ deliveryDetailotherMoneys=Double.valueOf(deliveryDetailOtherMoney.get("monery").toString());
moneryItemmap.put("DeliveryDetailOtherMoney", deliveryDetailOtherMoney);
moneryList.add(moneryItemmap);
}else{
@@ -304,7 +313,7 @@
}
//鏂板鍙戣揣鏄庣粏鏁版嵁
- deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney);
+ deliveryDetailMapper.insertDeliveryDetail(orderDetail, oddNumber, deliveryDetailmaximum + 1,deliveryDetailMoney,deliveryDetailotherMoneys);
//淇敼璁㈠崟鏄庣粏
deliveryDetailMapper.updateOrderDetailDeliveryNum(orderDetail);
//淇敼搴撳瓨琛ㄥ嚭搴撴暟閲�
--
Gitblit v1.8.0