diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 25badb7ae..ced1a42fe 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -248,27 +248,31 @@ 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 ( 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,'' + bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+late_pay_price-pay) + owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' 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,'' + bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay-pay) + owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' 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,'' + bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay+late_pay_price-pay) + owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' 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,'' + bill_type,need_pay,receive_pay,pay,(receive_pay+service_charge_pay-pay) + owe,receive_date,pay_date,expired_day,status,starttime,endtime,rent_shop_type,'' 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 @@ -277,16 +281,19 @@ 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,freeze + pay,(receive_pay+service_charge_pay-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,'' + need_pay,receive_pay,pay,(receive_pay+service_charge_pay-pay) owe,receive_date,pay_date,expired_day,status,'' + starttime,'' endtime,rent_shop_type,'' 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,'' + need_pay,receive_pay,pay,(receive_pay+service_charge_pay-pay) owe,receive_date,pay_date,expired_day,status,'' + starttime,'' endtime,rent_shop_type,'' price_detail,freeze from wx_bill_other_deposit where tenant_id=#{tenantId}