|
|
|
@@ -655,9 +655,9 @@ |
|
|
|
depositReceivePay, |
|
|
|
round((bill.otherReceivePay+bill.otherLatePay+bill.otherServiceChargePay-bill.otherPay)/100,2) |
|
|
|
otherReceivePay, |
|
|
|
round((bill.rentReceivePay+bill.rentLatePay+bill.rentServiceChargePay+bill.propertyReceivePay+bill.depositReceivePay+bill.otherReceivePay |
|
|
|
+bill.rentLatePay+bill.propertyLatePay+bill.depositLatePay+bill.otherLatePay+bill.rentServiceChargePay+bill.propertyServiceChargePay |
|
|
|
+bill.depositServiceChargePay+bill.otherServiceChargePay |
|
|
|
round((bill.rentReceivePay+bill.propertyReceivePay+bill.depositReceivePay+bill.otherReceivePay |
|
|
|
+bill.rentLatePay+bill.propertyLatePay+bill.depositLatePay+bill.otherLatePay |
|
|
|
+bill.rentServiceChargePay+bill.propertyServiceChargePay+bill.depositServiceChargePay+bill.otherServiceChargePay |
|
|
|
-bill.rentPay-bill.propertyPay-bill.depositPay-bill.otherPay)/100,2) totalReceivePay |
|
|
|
</when> |
|
|
|
<otherwise> |
|
|
|
@@ -774,7 +774,7 @@ |
|
|
|
select m.tenant_id,m.id,m.name,ws.shop_number shopNumber,ws.type,m.link_person linkPerson,m.link_phone linkPhone, |
|
|
|
xb.title business,rc.rental_start_date rentalStartDate,rc.rental_end_date rentalEndDate,rc.rent_shop_type, |
|
|
|
ifnull(round( |
|
|
|
(select sum(bill.receive_pay)+sum(bill.late_pay_price)+bill.receivePay from ( |
|
|
|
(select sum(bill.receive_pay)+sum(bill.late_pay_price)+sum(bill.receivePay) 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 |
|
|
|
@@ -818,7 +818,7 @@ |
|
|
|
)/100,2),0) payOut, |
|
|
|
|
|
|
|
(ifnull(round( |
|
|
|
(select sum(bill.receive_pay)+sum(bill.late_pay_price)+bill.receivePay from ( |
|
|
|
(select sum(bill.receive_pay)+sum(bill.late_pay_price)+sum(bill.receivePay) 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) |
|
|
|
|