| @@ -266,7 +266,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) | |||||
| need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type | need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type | ||||
| from wx_bill_other_deposit | from wx_bill_other_deposit | ||||
| ) bill | ) bill | ||||
| where DATEDIFF(bill.receive_date,now())=3 and bill.status not in(3.5,6) | |||||
| where DATEDIFF(bill.receive_date,now())=3 and bill.status not in(3,5,6) | |||||
| group by bill.tenant_id,bill.merchant_id,bill.receive_date) bill | group by bill.tenant_id,bill.merchant_id,bill.receive_date) bill | ||||
| left join wx_merchant m on bill.merchant_id=m.id | left join wx_merchant m on bill.merchant_id=m.id | ||||
| left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | ||||
| @@ -309,7 +309,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) | |||||
| need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type | need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type | ||||
| from wx_bill_other_deposit | from wx_bill_other_deposit | ||||
| ) bill | ) bill | ||||
| where DATEDIFF(bill.receive_date,now())<0 and bill.status not in(3.5,6) | |||||
| where DATEDIFF(bill.receive_date,now())<0 and bill.status not in(3,5,6) | |||||
| group by bill.tenant_id,bill.merchant_id) bill | group by bill.tenant_id,bill.merchant_id) bill | ||||
| left join wx_merchant m on bill.merchant_id=m.id | left join wx_merchant m on bill.merchant_id=m.id | ||||
| left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id | ||||