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 = ]]> #{param.startDateTime} and oi.pay_time #{param.endDateTime} @@ -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 = ]]> #{param.startDateTime} and oi.pay_time #{param.endDateTime} @@ -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 = ]]> #{param.startDateTime} and oi.pay_time #{param.endDateTime} @@ -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 = ]]> #{param.startDateTime} and oi.pay_time #{param.endDateTime} @@ -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 = ]]> #{param.startDateTime} and oi.pay_time #{param.endDateTime}