From d94e7d6bbf23698c27147a60ee866c64b2d43775 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 14 十一月 2024 09:37:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/java/com/mzl/flower/service/statistics/StatisticsService.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
index 9b2aecc..92767a5 100644
--- a/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
+++ b/src/main/java/com/mzl/flower/service/statistics/StatisticsService.java
@@ -9,6 +9,7 @@
import com.mzl.flower.dto.request.flower.FlowerQueryDTO;
import com.mzl.flower.dto.request.payment.OrderItemSalesQueryDTO;
import com.mzl.flower.dto.request.payment.OrderQueryDTO;
+import com.mzl.flower.dto.response.payment.OrderStatusCountDTO;
import com.mzl.flower.dto.response.statistics.FlowerStatisticsDTO;
import com.mzl.flower.dto.response.statistics.OrderStatisticsDTO;
import com.mzl.flower.dto.response.statistics.RateStatisticsDTO;
@@ -112,12 +113,20 @@
.eq("deleted", 0));
dto.setCustomerCount(cc.longValue());//用户管理：统计商户列表已启用的全部用户（点击跳转到商户列表）
- Integer oc = orderMapper.selectCount(new QueryWrapper<Order>()
- .eq("deleted", 0)
- .isNotNull("payment_time")
- .isNull("cancel_time")
- .isNull("refund_time"));
- dto.setOrderCount(oc.longValue());//订单管理：全部订单数量-待付款-已取消-已退款（点击跳转到订单列表）
+ //订单管理：全部订单数量-待付款-已取消-已退款（点击跳转到订单列表）
+ List<OrderStatusCountDTO> ll = orderMapper.getOrderStatusCount(new OrderQueryDTO());
+ Integer oc = 0;
+ if (ll != null && ll.size() > 0) {
+ for (OrderStatusCountDTO c : ll) {
+ if(Constants.ORDER_STATUS_BACKEND.PENDING.name().equals(c.getValue())
+ || Constants.ORDER_STATUS_BACKEND.CANCEL.name().equals(c.getValue())
+ || Constants.ORDER_STATUS_BACKEND.REFUND.name().equals(c.getValue())){
+ continue;
+ }
+ oc += c.getOrderCount();
+ }
+ }
+ dto.setOrderCount(oc.longValue());
page = new Page(1, 1);
OrderQueryDTO oq = new OrderQueryDTO();
--
Gitblit v1.9.3