From 2aca501eaf0e12e5792e1de08513b017baa517ae Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 19 Apr 2023 22:34:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/order/OrderController.java    |  5 +++++
 ghy-admin/src/main/resources/application.yaml        |  2 +-
 .../main/java/com/ghy/order/domain/OrderDetail.java  |  2 ++
 .../resources/mapper/order/OrderDetailMapper.xml     | 12 ++++++++++++
 4 files changed, 20 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 02c2582a..a01deba7 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
@@ -686,12 +686,17 @@ public class OrderController extends BaseController {
             response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
             // 统计待确认单量
             orderDetail.setOrderStatus(null);
+            orderDetail.setOrderStatusList(new ArrayList<Integer>(){{
+                add(4);
+                add(5);
+            }});
             orderDetail.setWorkFinishTimeExisted(true);
             orderDetail.setDrawCashStatusList(new ArrayList<Integer>() {{
                 add(0);
                 add(1);
             }});
             response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
+            orderDetail.setOrderStatusList(null);
             // 统计已完成子单量
             orderDetail.setOrderStatus(OrderStatus.FINISH.code());
             orderDetail.setDrawCashStatusList(new ArrayList<Integer>() {{
diff --git a/ghy-admin/src/main/resources/application.yaml b/ghy-admin/src/main/resources/application.yaml
index 1f953c82..5a633a07 100644
--- a/ghy-admin/src/main/resources/application.yaml
+++ b/ghy-admin/src/main/resources/application.yaml
@@ -59,7 +59,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
-    active: dev
+    active: druid
   # 文件上传
   servlet:
      multipart:
diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
index e44921a7..a5047859 100644
--- a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
+++ b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
@@ -144,4 +144,6 @@ public class OrderDetail extends BaseEntity {
     private BigDecimal changeMoney;
 
     private boolean workFinishTimeExisted;
+
+    private List<Integer> orderStatusList;
 }
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index d96f286b..9bd3de70 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -107,6 +107,12 @@
             <if test="orderStatus != null">
                 AND od.order_status = #{orderStatus}
             </if>
+            <if test="orderStatusList != null and orderStatusList.size() > 0">
+                AND od.order_status in
+                <foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
+                    #{orderStatus}
+                </foreach>
+            </if>
             <if test="orderMasterCode != null and orderMasterCode != ''">
                 AND od.order_master_code = #{orderMasterCode}
             </if>
@@ -178,6 +184,12 @@
             <if test="orderStatus != null">
                 AND od.order_status = #{orderStatus}
             </if>
+            <if test="orderStatusList != null and orderStatusList.size() > 0">
+                AND od.order_status in
+                <foreach collection="orderStatusList" item="orderStatus" open="(" separator="," close=")">
+                    #{orderStatus}
+                </foreach>
+            </if>
             <if test="orderMasterCode != null and orderMasterCode != 0">
                 AND od.order_detail_code = #{orderMasterCode}
             </if>