From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java
index a28e3fb..90d2b31 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/MgtBusinessDataService.java
@@ -111,12 +111,12 @@
long auctionOrderTotalCount = orderList.stream()
.filter(order -> order.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS))
.count();
- // 商城订单统计-订单总数
+ // 拍卖订单统计-拍卖商品订单
long auctionGoodsOrderCount = orderList.stream()
.filter(order -> order.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)
&& order.getAuctionOrderType().equals(AuctionOrderTypeEnum.REGULAR_ITEMS))
.count();
- // 拍卖订单统计-拍卖商品订单
+ // 拍卖订单统计-拍卖场订单
long auctionSalesroomOrderCount = orderList.stream()
.filter(order -> order.getOrderFrom().equals(OrderFromEnum.AUCTION_ORDERS)
&& order.getAuctionOrderType().equals(AuctionOrderTypeEnum.AUCTION_ITEMS))
--
Gitblit v1.7.1