From 78c1f97f28e63ca16a79392c32b8eeb6a066e39a Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 25 Oct 2019 13:38:42 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=8A=BC=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxBillAllMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index be3e4faa9..ede4dac46 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -915,19 +915,20 @@ select bill.* from ( select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金','租赁押金' - billType,need_pay,receive_pay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0 + billType,need_pay,receive_pay receivePay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,0 service_charge_pay from wx_bill_rent_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,'物业押金' name,4 billTypeValue,'物业押金' - billType,need_pay,receive_pay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0 + billType,need_pay,receive_pay receivePay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,0 service_charge_pay from wx_bill_property_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,comments as name,8 billTypeValue,concat('其他押金-',comments) as - billType,0 as need_pay,receive_pay,pay,owe,receive_date receiveDate,pay_date,expired_day,status,freeze,0 + billType,0 as need_pay,receive_pay receivePay,pay,owe,receive_date + receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,service_charge_pay from wx_bill_other_deposit where tenant_id=#{tenantId} ) bill