From f53fb4af943e9a82c250fb60ad6ed941fd8f5d33 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期日, 07 七月 2024 09:07:53 +0800
Subject: [PATCH] 提交相关程序
---
north-glass-erp/src/main/java/com/example/erp/service/sd/DeliveryService.java | 22 ++++++++++++++++------
1 files changed, 16 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 a7f156b..f609666 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
@@ -222,19 +222,28 @@
//鑾峰彇瀵硅薄闆嗗悎寰幆杩涜鏂板淇敼
if (!orderDetaillist.isEmpty()) {
for (OrderDetail orderDetail : orderDetaillist) {
- //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+ Integer calculateType=0;
+
+ if (orderDetail.getOrder().getOrderId()==null){
+ Order order=deliveryMapper.selectOrderId(orderDetail.getOrderId());
+ calculateType=order.getCalculateType();
+ }else{
+ calculateType=orderDetail.getOrder().getCalculateType();
+ }
double deliveryDetailMoney = 0.0;
- if (orderDetail.getOrder().getCalculateType()==1){
+ if (calculateType==1){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)))
*orderDetail.getDeliveryDetail().getQuantity()*orderDetail.getPrice()));
- }else if (orderDetail.getOrder().getCalculateType()==2){
+ }else if (calculateType==2){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",Double.valueOf(
String.format("%.2f", (orderDetail.getWidth()*orderDetail.getHeight()/1000000)*orderDetail.getDeliveryDetail().getQuantity())
- )*orderDetail.getPrice()));
- }else if (orderDetail.getOrder().getCalculateType()==3){
+ )*orderDetail.getPrice()));
+ }else if (calculateType==3){
deliveryDetailMoney=Double.valueOf(String.format("%.2f",orderDetail.getPrice() * orderDetail.getDeliveryDetail().getQuantity()));
}
+ //鏍规嵁璁㈠崟璁＄畻鏂瑰紡杩涜閲戦璁＄畻
+
//瀵瑰惊鐜槑缁嗙殑鏁版嵁杩涜绱姞
quantity += orderDetail.getDeliveryDetail().getQuantity();
@@ -275,8 +284,9 @@
deliveryOtherMoneyMapper.insertDeliveryOtherMoney(deliveryOtherMoney);
}
});
+ int intMoney= (int) Math.floor(money);
//淇敼鍙戣揣鏄庣粏绱姞闈㈢Н鏁伴噺閲戦
- deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(String.format("%.2f", money)), otherMoney.get(), oddNumber);
+ deliveryMapper.updatedelivery(Double.valueOf(String.format("%.2f", area)), quantity, Double.valueOf(intMoney), otherMoney.get(), oddNumber);
} else {
return false;
--
Gitblit v1.8.0