|
|
|
@@ -708,7 +708,7 @@ |
|
|
|
pay,sum(bill.late_pay_price) latePayPrice,sum(bill.service_charge_pay) serviceChargePay from ( |
|
|
|
|
|
|
|
select id,merchant_id,shop_id,tenant_id,'租金' name,1 bill_type_value,'租金' |
|
|
|
bill_type,need_pay,receive_pay,pay,(receive_pay+) owe,DATE_FORMAT(receive_date,'%Y-%m-%d') |
|
|
|
bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') |
|
|
|
receive_date,pay_date,expired_day,status,'' starttime,'' |
|
|
|
endtime,rent_shop_type,late_pay_price,service_charge_pay from wx_bill_rent where tenant_id = #{tenantId} and |
|
|
|
is_preview = 0 |
|
|
|
@@ -721,7 +721,9 @@ |
|
|
|
<include refid="getOweBillAsPageConditions"/> |
|
|
|
union all |
|
|
|
select res.id,res.merchant_id,res.shop_id,res.tenant_id,res.name,res.bill_type_value,res.bill_type,res.need_pay, |
|
|
|
res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type,0 late_pay_price from( |
|
|
|
res.receive_pay,res.pay,res.owe |
|
|
|
owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type,0 |
|
|
|
late_pay_price,service_charge_pay from( |
|
|
|
select id,merchant_id,shop_id,tenant_id,'欠缴押金' name,2 bill_type_value,'欠缴押金' |
|
|
|
bill_type,need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date,expired_day,status,'' starttime,'' |
|
|
|
endtime,rent_shop_type,service_charge_pay from wx_bill_rent_deposit where tenant_id = #{tenantId} |
|
|
|
@@ -740,7 +742,9 @@ |
|
|
|
) res |
|
|
|
union all |
|
|
|
select res.id,res.merchant_id,res.shop_id,res.tenant_id,res.name,res.bill_type_value,res.bill_type,res.need_pay, |
|
|
|
res.receive_pay,res.pay,res.owe owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type,0 late_pay_price from( |
|
|
|
res.receive_pay,res.pay,res.owe |
|
|
|
owe,res.receive_date,res.pay_date,res.expired_day,res.status,res.starttime,res.endtime,res.rent_shop_type,0 |
|
|
|
late_pay_price,service_charge_pay from( |
|
|
|
select id,merchant_id,shop_id,tenant_id,'其他费用' name,5 bill_type_value,'其他费用' bill_type,0 as |
|
|
|
need_pay,receive_pay,pay,owe,DATE_FORMAT(receive_date,'%Y-%m-%d') receive_date,pay_date, |
|
|
|
expired_day,status,'' starttime,'' endtime,rent_shop_type,service_charge_pay |
|
|
|
|