From 00754cdb265f74fb8206be3ada8c5e0410e5042d Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 3 Jul 2019 11:58:04 +0800 Subject: [PATCH] =?UTF-8?q?[SQL][=E4=BF=AE=E6=94=B9][=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E5=8F=8A=E7=89=A9=E4=B8=9A=E8=B4=A6=E5=8D=95=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E6=9C=80=E5=A4=A7=E5=91=A8=E6=9C=9F=E5=AD=97=E6=AE=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/WxBillPropertyMapper.xml | 10 ++++------ .../main/resources/mapper/WxBillRentMapper.xml | 15 ++++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index a4db8b75f..06f98025a 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -89,14 +89,12 @@ select br.`id`,br.`receive_pay`,br.`pay`,br.`receive_date`,br.`pay_date`,br.`createtime`,br.`expired_day`, - case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,m.`name` - merchant_name,s.shop_number,br.`updatetime`, - br.`merchant_id`,br.`rent_shop_type`,r.type as - rent_type,r.pay_ratio,br.`revenue`,br.`late_pay_ratio`,br.`late_pay_time`,br.`period`, - br.`rent_contract_id`,d.receive_pay deposit,case when br.late_pay_status=2 then (case when br.late_pay_time is - null then 0 + case when br.status=1 then br.owe else 0 end owe,br.`status`,br.`need_pay`,m.`name` merchant_name, + s.shop_number,br.`updatetime`,br.`merchant_id`,br.`rent_shop_type`,r.type as rent_type, + r.pay_ratio,br.`revenue`,br.`late_pay_ratio`,br.`late_pay_time`,br.`period`,br.`rent_contract_id`, + d.receive_pay deposit,case when br.late_pay_status=2 then (case when br.late_pay_time is null then 0 else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe)end) else br.late_pay_price end - late_pay_price,d.`status` deposit_status, - br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime, - (select max(period) from wx_bill_rent where rent_contract_id=br.rent_contract_id) as all_period + late_pay_price,d.`status` + deposit_status,br.shop_info,br.pay_way,br.late_pay_status,br.`comments`,br.starttime,br.endtime from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id left join wx_shop s on br.shop_id=s.id left join wx_rent_contract r on br.rent_contract_id=r.id