From 18957b09ef30b8ebc3485a4a78a464d6eb50a3ec Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 28 Mar 2023 00:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E4=B8=80commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ghy/web/controller/order/OrderController.java    | 12 ++++++++++--
 .../main/java/com/ghy/order/domain/OrderDetail.java  |  2 ++
 .../resources/mapper/order/OrderDetailMapper.xml     | 12 ++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

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 3eb92efc..3c1ad706 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
@@ -661,13 +661,21 @@ public class OrderController extends BaseController {
             orderDetail.setOrderStatus(OrderStatus.SERVER.code());
             response.setServingOrderNum(orderDetailService.countOrderDetailList(orderDetail));
             // 统计待确认单量
-            orderDetail.setOrderStatus(OrderStatus.FINISH_CHECK.code());
+            orderDetail.setOrderStatus(null);
             orderDetail.setWorkFinishTimeExisted(true);
+            orderDetail.setDrawCashStatusList(new ArrayList<Integer>(){{
+                add(0);
+                add(1);
+            }});
             response.setWaitSureOrderNum(orderDetailService.countOrderDetailList(orderDetail));
-            orderDetail.setWorkFinishTimeExisted(false);
             // 统计已完成子单量
             orderDetail.setOrderStatus(OrderStatus.FINISH.code());
+            orderDetail.setDrawCashStatusList(new ArrayList<Integer>(){{
+                add(2);
+            }});
             response.setFinishedOrderNum(orderDetailService.countOrderDetailList(orderDetail));
+            orderDetail.setWorkFinishTimeExisted(false);
+            orderDetail.setDrawCashStatusList(null);
             // 统计已完成主单量
             orderMaster.setOrderStatus(OrderStatus.FINISH.code());
             response.setFinishedMasterOrderNum(orderMasterService.countOrderMasterList(orderMaster));
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 c12ed3be..4d8b1aac 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
@@ -107,6 +107,8 @@ public class OrderDetail extends BaseEntity {
      */
     private Integer drawCashStatus;
 
+    private List<Integer> drawCashStatusList;
+
     /**
      * 发起提现时间 draw_cash_time
      */
diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
index e9788e59..d96f286b 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderDetailMapper.xml
@@ -140,6 +140,12 @@
             <if test="drawCashStatus != null">
                 AND od.draw_cash_status = ${drawCashStatus}
             </if>
+            <if test="drawCashStatusList != null and drawCashStatusList.size() > 0">
+                AND od.draw_cash_status in
+                <foreach collection="drawCashStatusList" item="drawCashStatus" open="(" separator="," close=")">
+                    #{drawCashStatus}
+                </foreach>
+            </if>
             <if test="workFinishTimeExisted">
                 AND od.work_finish_time is not null
             </if>
@@ -199,6 +205,12 @@
             <if test="workFinishTimeExisted">
                 AND od.work_finish_time is not null
             </if>
+            <if test="drawCashStatusList != null and drawCashStatusList.size() > 0">
+                AND od.draw_cash_status in
+                <foreach collection="drawCashStatusList" item="drawCashStatus" open="(" separator="," close=")">
+                    #{drawCashStatus}
+                </foreach>
+            </if>
         </where>
         order by od.create_time
         <trim suffixOverrides=",">