From 388dc59f69027c5746590662d03c35dcde761b18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 16 一月 2025 21:00:12 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index d015b58..e68d5a8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -335,14 +335,14 @@
for (Order order : value) {
if (order.getOrderType().equals(1)) {
serviceTotal++;
- serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
+ serviceTotalMoney = serviceTotalMoney.add(order.getTotalAmount());
total++;
- totalMoney = totalMoney.add(order.getPaymentAmount());
- }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){
+ totalMoney = totalMoney.add(order.getTotalAmount());
+ }else if (order.getOrderType().equals(2)){
singleTotal++;
- singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ singleTotalMoney = singleTotalMoney.add(order.getTotalAmount());
total++;
- totalMoney = totalMoney.add(order.getPaymentAmount());
+ totalMoney = totalMoney.add(order.getTotalAmount());
}
}
orderStatisticsDetail.setDate(key);
--
Gitblit v1.7.1