From 8f9edd13367990e6d7277050f32359ac51940c8c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 17:01:07 +0800
Subject: [PATCH] 加密

---
 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 a1e1094..f319d8d 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
@@ -327,14 +327,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