|
|
|
@@ -248,7 +248,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) |
|
|
|
where DATEDIFF(bill.receive_date,now())=3 and bill.status!=3 |
|
|
|
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 (select tenant_id,`name` appname from wx_appinfo app where type=2) 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 |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
@@ -287,7 +287,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0) |
|
|
|
where DATEDIFF(bill.receive_date,now())<0 and bill.status!=3 |
|
|
|
group by bill.tenant_id,bill.merchant_id) bill |
|
|
|
left join wx_merchant m on bill.merchant_id=m.id |
|
|
|
left join (select tenant_id,`name` appname from wx_appinfo app where type=2) 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 |
|
|
|
|
|
|
|
</select> |
|
|
|
|
|
|
|
|