From 981bbdbe6d48a8e4f8c8d58567d5dddbd96e7fb3 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Tue, 24 Jun 2025 13:35:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=80=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/report/TradeReportMapper.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml
index feca862..cd4976c 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml
@@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 group by
                     ats.order_no) b on
                 oi.order_id = b.order_no
-        where oi.pay_state = 3 and oi.order_state in (1, 2)
+        where oi.pay_state = 3 and oi.order_state in (1, 2, 5)
         and oi.pay_time <![CDATA[ >= ]]> #{param.startDateTime}
         and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 oi.canteen_id = ac.canteen_id
                 left join basic_stall ast on
                 oi.stall_id = ast.stall_id
-        where oi.pay_state = 3 and oi.order_state in (1, 2)
+        where oi.pay_state = 3 and oi.order_state in (1, 2, 5)
         and oi.pay_time <![CDATA[ >= ]]> #{param.startDateTime}
         and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">
@@ -225,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 oi.user_id = su.user_id
                 left join device_info di on
                 oi.device_sn = di.device_sn and oi.device_num = di.device_number
-        where oi.source_type = 20 and oi.pay_state = 3 and oi.order_state in (1, 2)
+        where oi.source_type = 20 and oi.pay_state = 3 and oi.order_state in (1, 2, 5)
         and oi.pay_time <![CDATA[ >= ]]> #{param.startDateTime}
         and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">
@@ -301,7 +301,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 oi.user_id = su.user_id
                 left join sys_dept sd on
                 su.dept_id = sd.dept_id
-        where oi.pay_state = 3 and oi.order_state in (1, 2)
+        where oi.pay_state = 3 and oi.order_state in (1, 2, 5)
         and oi.pay_time <![CDATA[ >= ]]> #{param.startDateTime}
         and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">
@@ -373,7 +373,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     and od.goods_id = mrd.dishes_id
         where
             oi.pay_state = 3
-        and oi.order_state in (1, 2)
+        and oi.order_state in (1, 2, 5)
         and oi.pay_time <![CDATA[ >= ]]> #{param.startDateTime}
         and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
         <if test="param.deptIdList != null and param.deptIdList.size() > 0">