| @@ -18,8 +18,8 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`settle_number`,`merchant_id`,`status`,`apply_status`, | |||||
| `receive_money`,`pay_money`,`settletime`,`createtime`,`updatetime` | |||||
| `id`,`tenant_id`,`settle_number`,`merchant_id`,`status`,`apply_status`, | |||||
| `receive_money`,`pay_money`,`settletime`,`createtime`,`updatetime` | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
| @@ -98,12 +98,13 @@ | |||||
| ) bill | ) bill | ||||
| on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0 | on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=0 | ||||
| ) receiveMoney, | ) receiveMoney, | ||||
| (select IFNULL(sum(bill.owe),0) from wx_bill_settle_bill bb left join | (select IFNULL(sum(bill.owe),0) from wx_bill_settle_bill bb left join | ||||
| (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金' | (select id,merchant_id,shop_id,tenant_id,1 bill_type_value,'租金' | ||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 | bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_rent where is_preview = 0 | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,2 bill_type_value,'租赁押金' | select id,merchant_id,shop_id,tenant_id,2 bill_type_value,'租赁押金' | ||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from | |||||
| bill_type,need_pay,receive_pay,pay,receive_pay owe,receive_date,pay_date,expired_day,status,rent_shop_type from | |||||
| wx_bill_rent_deposit | wx_bill_rent_deposit | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,3 bill_type_value,'物业费' | select id,merchant_id,shop_id,tenant_id,3 bill_type_value,'物业费' | ||||
| @@ -111,7 +112,7 @@ | |||||
| wx_bill_property where is_preview = 0 | wx_bill_property where is_preview = 0 | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,4 bill_type_value,'物业押金' | select id,merchant_id,shop_id,tenant_id,4 bill_type_value,'物业押金' | ||||
| bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from | |||||
| bill_type,need_pay,receive_pay,pay,receive_pay owe,receive_date,pay_date,expired_day,status,rent_shop_type from | |||||
| wx_bill_property_deposit | wx_bill_property_deposit | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,5 bill_type_value,'水费' bill_type,0 as | select id,merchant_id,shop_id,tenant_id,5 bill_type_value,'水费' bill_type,0 as | ||||
| @@ -130,7 +131,7 @@ | |||||
| need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other | need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other | ||||
| union all | union all | ||||
| select id,merchant_id,shop_id,tenant_id,8 bill_type_value,'其他押金' bill_type,0 as | select id,merchant_id,shop_id,tenant_id,8 bill_type_value,'其他押金' bill_type,0 as | ||||
| need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit | |||||
| need_pay,receive_pay,pay,receive_pay owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit | |||||
| union all | union all | ||||
| select id,id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴' bill_type,0 as | select id,id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴' bill_type,0 as | ||||
| need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type from wx_merchant_subsidy | need_pay,subsidy receive_pay,0 pay,subsidy owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type from wx_merchant_subsidy | ||||