From 40356243f5ff75f9133c02e84312d9c7999fb8b9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 17:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 d9dce7f..e3d535c 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
@@ -317,12 +317,14 @@
if (order.getOrderType().equals(1)) {
serviceTotal++;
serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
- }else if (order.getOrderType().equals(2)){
+ total++;
+ totalMoney = totalMoney.add(order.getPaymentAmount());
+ }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){
singleTotal++;
singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
+ total++;
+ totalMoney = totalMoney.add(order.getPaymentAmount());
}
- total++;
- totalMoney = totalMoney.add(order.getPaymentAmount());
}
orderStatisticsDetail.setDate(key);
orderStatisticsDetail.setServiceTotal(serviceTotal);
--
Gitblit v1.7.1