From 2d06f61d8f0d07adcdff290dcbe6416dcfcf7de6 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 18 Apr 2019 17:19:14 +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=A0=B9=E6=8D=AE=E5=95=86=E6=88=B7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=91=E9=80=81=E5=BE=85=E7=BC=B4=E4=BF=A1?= =?UTF-8?q?=E6=81=AF]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillAllMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 4842557d0..b647997df 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -310,11 +310,11 @@ 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 not in(3,5,6) + where 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 - where m.status=1 + where m.status=1 and DATEDIFF(bill.receive_date,now())=m.bill_setting @@ -396,14 +396,14 @@ 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 not in(3,5,6) + where bill.status not in(3,5,6) group by bill.tenant_id,bill.merchant_id,bill.receive_date,bill.bill_type ) 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 left join wx_merchant_shop wms on wms.merchant_id = m.id left join wx_shop ws on wms.shop_id = ws.id - where m.status=1 + where m.status=1 and DATEDIFF(bill.receive_date,now())=m.bill_setting