| @@ -324,6 +324,9 @@ | |||||
| 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,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit | ||||
| union all | |||||
| select id,id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴' bill_type,0 as | |||||
| need_pay,subsidy receive_pay,0 pay,0 owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type from wx_merchant_subsidy | |||||
| ) 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) | ||||
| - | - | ||||
| @@ -360,6 +363,9 @@ | |||||
| 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,owe,receive_date,pay_date,expired_day,status,rent_shop_type from wx_bill_other_deposit | ||||
| union all | |||||
| select id,id merchant_id,'' shop_id,tenant_id,10 bill_type_value,'补贴' bill_type,0 as | |||||
| need_pay,subsidy receive_pay,0 pay,0 owe,'' receive_date,'' pay_date,'' expired_day,status,'' rent_shop_type from wx_merchant_subsidy | |||||
| ) bill | ) bill | ||||
| on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=1 | on(bb.bill_id=bill.id) where bb.settle_id = s.id and bb.type=1 | ||||
| ) | ) | ||||