From be15f9393aee1c60be22e1155d9d3503d50c56b3 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 25 Oct 2019 10:56:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=BB=93=E7=AE=97=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=9F=A5=E8=AF=A2=E6=8A=BC=E9=87=91]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/WxBillAllMapper.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) 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