| @@ -245,30 +245,30 @@ | |||
| bill.receive_pay receivePay,bill.pay,bill.owe,bill.receive_date receiveDate,bill.pay_date payDate,DATEDIFF(now(),bill.receive_date) expiredDay,bill.status, | |||
| bill.tenant_id tenantId,m.name merchantName,s.shop_number shopNumber,bill.starttime,bill.endtime,bill.name,pb.pay_bill_status payBillStatus, | |||
| pb.pay_time_end tradeTime,pb.transaction_id transactionId,pb.pay_amount payAmount,bill.rent_shop_type | |||
| rentShopType,bill.price_detail priceDetail from ( | |||
| 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,owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' | |||
| price_detail | |||
| price_detail,freeze | |||
| from wx_bill_rent where is_preview = 0 and tenant_id=#{tenantId} and rent_contract_id in (select id from | |||
| wx_rent_contract where status in | |||
| (2,3,4)) | |||
| union all | |||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,'租赁押金' name,2 bill_type_value,'租赁押金' | |||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' | |||
| price_detail | |||
| price_detail,freeze | |||
| from wx_bill_rent_deposit where tenant_id=#{tenantId} and rent_contract_id in (select id from wx_rent_contract | |||
| 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,owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' | |||
| price_detail | |||
| price_detail,freeze | |||
| from wx_bill_property where is_preview = 0 and tenant_id=#{tenantId} and property_contract_id in (select id from | |||
| wx_property_contract | |||
| where status in(2,3,4)) | |||
| union all | |||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,'物业押金' name,4 bill_type_value,'物业押金' | |||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' | |||
| price_detail | |||
| price_detail,freeze | |||
| from wx_bill_property_deposit where tenant_id=#{tenantId} and property_contract_id in (select id from | |||
| wx_property_contract where status in | |||
| (2,3,4)) | |||
| @@ -276,17 +276,17 @@ | |||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,case when type=1 then '水费' when type=2 then '电费' else '空调费' end name, | |||
| case when type=1 then 5 when type=2 then 6 else 9 end bill_type_value, | |||
| case when type=1 then '水费' when type=2 then '电费' else '空调费' end bill_type, 0 as need_pay,receive_pay, | |||
| pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,price_detail | |||
| pay,owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,price_detail,freeze | |||
| from wx_bill_daily where tenant_id=#{tenantId} | |||
| union all | |||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,name,7 bill_type_vaue,'其他费用' bill_type,0 as | |||
| need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type,'' | |||
| price_detail | |||
| price_detail,freeze | |||
| from wx_bill_other where tenant_id=#{tenantId} | |||
| union all | |||
| select '' settle_number,id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,'其他押金' bill_type,0 as | |||
| need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,'' starttime,'' endtime,rent_shop_type,'' | |||
| price_detail | |||
| price_detail,freeze | |||
| from wx_bill_other_deposit where tenant_id=#{tenantId} | |||
| union all | |||
| @@ -366,7 +366,7 @@ | |||
| - | |||
| (select IFNULL(sum(settle_money),0) from wx_bill_settle_record where settle_id = s.id) | |||
| ) receive_pay | |||
| ,0 pay,0 owe,s.createtime receive_date,'' pay_date,0 expired_day,status,'' starttime,'' endtime,'' rent_shop_type,'' price_detail | |||
| ,0 pay,0 owe,s.createtime receive_date,'' pay_date,0 expired_day,status,'' starttime,'' endtime,'' rent_shop_type,'' price_detail, 0 freeze | |||
| from wx_bill_settle s where s.tenant_id=#{tenantId} and s.status >0 | |||
| ) bill | |||
| @@ -375,6 +375,7 @@ | |||
| left join wx_pay_bill pb on bill.id=pb.bill_id | |||
| where 1=1 | |||
| <if test=" null != id "> | |||
| and bill.id=#{id} | |||
| </if> | |||
| @@ -409,7 +410,7 @@ | |||
| <if test=" null != rentShopType "> | |||
| and bill.rent_shop_type = #{rentShopType} | |||
| </if> | |||
| order by bill.merchant_id,bill.status,bill.receive_date desc | |||
| order by bill.merchant_id,bill.status desc,bill.receive_date desc | |||
| </select> | |||