| @@ -248,7 +248,7 @@ | |||||
| pb.pay_time_end tradeTime,pb.transaction_id transactionId,pb.pay_amount payAmount,bill.rent_shop_type | 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 ( | rentShopType,bill.price_detail priceDetail,bill.freeze from ( | ||||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' | 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,'' | owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' | ||||
| price_detail,freeze | price_detail,freeze | ||||
| from wx_bill_rent where is_preview = 0 and tenant_id=#{tenantId} and rent_contract_id in (select id from | 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)) | where status in (2,3,4)) | ||||
| union all | union all | ||||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,'物业费' name,3 bill_type_value,'物业费' | 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,'' | owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' | ||||
| price_detail,freeze | price_detail,freeze | ||||
| from wx_bill_property where is_preview = 0 and tenant_id=#{tenantId} and property_contract_id in (select id from | from wx_bill_property where is_preview = 0 and tenant_id=#{tenantId} and property_contract_id in (select id from | ||||