diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 72c14a7a0..05ec1fb77 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -913,19 +913,18 @@ select bill.* from ( select 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,rent_shop_type,shop_info,NULL - comments,'' price_detail,updatetime,freeze from wx_bill_rent_deposit where - tenant_id=#{tenantId} + bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0 + service_charge_pay + from wx_bill_rent_deposit where tenant_id=#{tenantId} union all select 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,rent_shop_type,shop_info,NULL - comments,'' price_detail,updatetime,freeze from wx_bill_property_deposit where - tenant_id=#{tenantId} + bill_type,need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 late_pay_price,0 + service_charge_pay + from wx_bill_property_deposit where tenant_id=#{tenantId} union all select id,merchant_id,shop_id,tenant_id,comments as name,8 bill_type_value,concat('其他押金-',comments) as - bill_type,0 as - need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,rent_shop_type,'[]' shop_info,comments,'' - price_detail,updatetime,freeze + bill_type,0 as need_pay,receive_pay,pay,owe,receive_date,pay_date,expired_day,status,freeze,0 + late_pay_price,service_charge_pay from wx_bill_other_deposit where tenant_id=#{tenantId} ) bill where 1=1