|
|
|
@@ -915,17 +915,19 @@ |
|
|
|
select bill.* |
|
|
|
from ( |
|
|
|
select id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 billTypeValue,'租赁押金','租赁押金' |
|
|
|
billType,need_pay,receive_pay,pay,owe,receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,0 |
|
|
|
billType,need_pay,receive_pay,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,receiveDate,pay_date,expired_day,status,freeze,0 late_pay_price,0 |
|
|
|
billType,need_pay,receive_pay,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,receiveDate,pay_date,expired_day,status,freeze,0 |
|
|
|
billType,0 as need_pay,receive_pay,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 |
|
|
|
|