From 1052ecb244fbee754a6406abc54b98ae983f68ac Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期四, 12 九月 2024 16:38:32 +0800
Subject: [PATCH] 订单打印 总金额
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 7 +++++++
src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java | 3 +++
src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java | 4 ++++
3 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
index 2ba18f0..36b99e9 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -53,4 +54,6 @@
private List<OrderItemListDTO> items;
private String createBy;
+
+ private BigDecimal totalAmount;//订单金额
}
diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java
index f1f14bd..32b9b99 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckLocationListDTO.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
@Data
@@ -40,4 +41,7 @@
private List<OrderItemLocationListDTO> items;
private String createBy;
+
+ @ApiModelProperty(value = "总金额")
+ private BigDecimal totalAmount;
}
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 75a5177..54c79fb 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -910,6 +910,13 @@
result.add(llc);
}
+
+ BigDecimal t = llc.getTotalAmount();
+ if(t == null){
+ t = new BigDecimal(0);
+ }
+ t = t.add(c.getTotalAmount());
+ llc.setTotalAmount(t);
}
Map<Long, String> stationMap = prepareStationMap();
--
Gitblit v1.9.3