diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 8b69b88f8..d1f6fd3a5 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -778,22 +778,22 @@ select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_rent where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_rent_deposit where status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_property where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_property_deposit where status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_daily where type in(1,2,3) and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_other where status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_other_deposit where status not in(3,6) ) bill where bill.merchant_id = m.id )/100,2),0) receivePay, @@ -819,26 +819,26 @@ (ifnull(round( (select sum(bill.receive_pay)+sum(bill.late_pay_price)+bill.receivePay from ( - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_rent where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_rent_deposit where status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,late_pay_price from wx_bill_property where is_preview = 0 and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_property_deposit where status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_daily where type in(1,2,3) and status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_other where status not in(3,6) union all - select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay, receivePay,0 late_pay_price from + select merchant_id,receive_pay,ifnull(service_charge_pay,0) receivePay,0 late_pay_price from wx_bill_other_deposit where status not in(3,6) ) bill where bill.merchant_id = m.id )/100,2),0)-