From c2dddb2770d9c6fbf5eaf7912ad3521eddf138db Mon Sep 17 00:00:00 2001 From: gongbiao Date: Tue, 22 Oct 2019 19:17:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=B4=A6=E5=8D=95][=E4=BF=AE=E6=94=B9][B?= =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2]?= 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 6153441b8..d6af0ac00 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -248,7 +248,7 @@ pb.pay_time_end tradeTime,pb.transaction_id transactionId,pb.pay_amount payAmount,bill.rent_shop_type rentShopType,bill.price_detail priceDetail,bill.freeze from ( select '' settle_number,id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' - bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+late_pay_price-pay) + bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' price_detail,freeze from wx_bill_rent where is_preview = 0 and tenant_id=#{tenantId} and rent_contract_id in (select id from @@ -263,7 +263,7 @@ where status in (2,3,4)) union all select '' settle_number,id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' - bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+late_pay_price-pay) + bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+ifnull(late_pay_price,0)-pay) owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' price_detail,freeze from wx_bill_property where is_preview = 0 and tenant_id=#{tenantId} and property_contract_id in (select id from