bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表增加 部分退单状态

This commit is contained in:
gaowdong 2025-06-24 13:35:32 +08:00
parent 965c082f59
commit 981bbdbe6d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/report/TradeReportMapper.xml
View File

@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by group by
ats.order_no) b on ats.order_no) b on
oi.order_id = b.order_no 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.startDateTime}
and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime} and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
<if test="param.deptIdList != null and param.deptIdList.size() > 0"> <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 oi.canteen_id = ac.canteen_id
left join basic_stall ast on left join basic_stall ast on
oi.stall_id = ast.stall_id 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.startDateTime}
and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime} and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
<if test="param.deptIdList != null and param.deptIdList.size() > 0"> <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 oi.user_id = su.user_id
left join device_info di on left join device_info di on
oi.device_sn = di.device_sn and oi.device_num = di.device_number 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.startDateTime}
and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime} and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
<if test="param.deptIdList != null and param.deptIdList.size() > 0"> <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 oi.user_id = su.user_id
left join sys_dept sd on left join sys_dept sd on
su.dept_id = sd.dept_id 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.startDateTime}
and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime} and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
<if test="param.deptIdList != null and param.deptIdList.size() > 0"> <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 and od.goods_id = mrd.dishes_id
where where
oi.pay_state = 3 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.startDateTime}
and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime} and oi.pay_time <![CDATA[ <= ]]> #{param.endDateTime}
<if test="param.deptIdList != null and param.deptIdList.size() > 0"> <if test="param.deptIdList != null and param.deptIdList.size() > 0">