From faacaa35cc23fc439200c6a9e98adcb306c3df3c Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 26 Feb 2023 01:17:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ghy/web/controller/order/OrderController.java   | 5 ++++-
 .../java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java    | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index ec9b2391..66feddd4 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -326,7 +326,7 @@ public class OrderController extends BaseController {
 
 
 //      createFinancialDetail(goodsList.get(0).getDeptGoodsCategoryId(), deptId, customer, payMoney, financialMaster);
-        
+
         //生成财务子单
         createFinancialDetail(appGoodsList,deptId, customer, payMoney, financialMaster);
 
@@ -547,6 +547,9 @@ public class OrderController extends BaseController {
             // 统计已完成子单量
             orderDetail.setOrderStatus(OrderStatus.FINISH.code());
             response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail));
+            // 统计已完成主单量
+            orderMaster.setOrderStatus(OrderStatus.FINISH.code());
+            response.setFinishedMasterOrderNum(orderMasterService.countOrderMasterList(orderMaster));
             // 统计监控单量
             orderMaster.setOrderStatus(null);
             orderMaster.setIsMonitoredOrder(true);
diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java
index 2357f690..52509bef 100644
--- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java
+++ b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderStatisticsResponse.java
@@ -19,6 +19,7 @@ public class OrderStatisticsResponse {
     private long todayOrderNum;
     private long tomorrowOrderNum;
     private long finishedOrderNum;
+    private long finishedMasterOrderNum;
     private long monitoredOrderNum;
     private long shelvedOrderNum;
     private long afterListNum;