From ed174ba501072a8bb3f424e3b0c431d660fec719 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 28 Feb 2019 10:43:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95=E6=8F=90=E9=86=92][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkService/src/main/resources/mapper/WxBillAllMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 5cac429e5..0597d905e 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -263,7 +263,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 from wx_bill_other_deposit ) bill - where DATEDIFF(bill.receive_date,now())=3 and bill.status!=3 and bill.status!=5 + 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 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 @@ -306,7 +306,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 from wx_bill_other_deposit ) bill - where DATEDIFF(bill.receive_date,now())<0 and bill.status!=3 and bill.status!=5 + where DATEDIFF(bill.receive_date,now())<0 and bill.status not in(3.5,6) 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=1) app on bill.tenant_id=app.tenant_id