diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 2c6e222f6..ccdd062a2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -111,14 +111,14 @@ update wx_bill_property set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and DATEDIFF(now(),receive_date)>0 + where tenant_id=#{tenantId} and status!=#{paid} and status != 6 and DATEDIFF(now(),receive_date)>0 update wx_bill_property set status=#{waitPay} where id in( select a.id from (select br.id,rc.receive_period,br.property_contract_id,br.receive_date from wx_bill_property br left join wx_property_contract rc on br.property_contract_id=rc.id - where br.tenant_id=#{tenantId} and br.status!=#{paid} and now() < br.receive_date + where br.tenant_id=#{tenantId} and br.status!=#{paid} and status != 6 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a) diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 91cc63fc1..a65f5fc61 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -113,14 +113,14 @@ update wx_bill_rent set status=#{notPaid},expired_day=DATEDIFF(now(),receive_date) - where tenant_id=#{tenantId} and status!=#{paid} and DATEDIFF(now(),receive_date)>0 + where tenant_id=#{tenantId} and status!=#{paid} and br.status!=6 and DATEDIFF(now(),receive_date)>0 update wx_bill_rent set status=#{waitPay} where id in( select a.id from (select br.id,rc.receive_period,br.rent_contract_id,br.receive_date from wx_bill_rent br left join wx_rent_contract rc on br.rent_contract_id=rc.id - where br.tenant_id=#{tenantId} and br.status!=#{paid} and now() < br.receive_date + where br.tenant_id=#{tenantId} and br.status!=#{paid} and br.status!=6 and now() < br.receive_date and DATE_ADD(now(),INTERVAL 1 MONTH)>br.receive_date) a)