|
@@ -603,14 +603,14 @@
|
|
select SUM(ttar.trans_amount_) amount
|
|
select SUM(ttar.trans_amount_) amount
|
|
from tenant_teacher_account_record ttar
|
|
from tenant_teacher_account_record ttar
|
|
left join user_order uo ON uo.order_no_ = ttar.order_no_
|
|
left join user_order uo ON uo.order_no_ = ttar.order_no_
|
|
- where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN'
|
|
|
|
|
|
+ where uo.status_ = 'PAID' AND ttar.in_or_out_ = 'IN' AND ttar.post_status_ != 'CANCEL'
|
|
AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId}
|
|
AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ttar.teacher_id_ = #{param.teacherId}
|
|
AND ttar.biz_type_ = #{param.type}
|
|
AND ttar.biz_type_ = #{param.type}
|
|
UNION ALL
|
|
UNION ALL
|
|
select SUM(ucar.trans_amount_) amount
|
|
select SUM(ucar.trans_amount_) amount
|
|
from user_cash_account_record ucar
|
|
from user_cash_account_record ucar
|
|
left join user_order uo ON uo.order_no_ = ucar.order_no_
|
|
left join user_order uo ON uo.order_no_ = ucar.order_no_
|
|
- where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN'
|
|
|
|
|
|
+ where uo.status_ = 'PAID' AND ucar.in_or_out_ = 'IN' AND ucar.post_status_ != 'CANCEL'
|
|
AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId}
|
|
AND DATE_FORMAT(uo.create_time_,'%Y-%m-%d') BETWEEN #{param.startTime} AND #{param.endTime} AND ucar.account_id_ = #{param.teacherId}
|
|
AND ucar.biz_type_ = #{param.type}
|
|
AND ucar.biz_type_ = #{param.type}
|
|
) a
|
|
) a
|