diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 5e623f48f..1516ad3ef 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -179,7 +179,7 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { Map property = getById(id); //押金 WxBillPropertyDeposit depositParam = new WxBillPropertyDeposit(); - depositParam.setPropertyContractId(id); + depositParam.setPropertyContractId((Long) property.get("propertyContractId")); Map deposit = wxBillPropertyDepositMapper.queryBillDepositList(depositParam).get(0); //周期 Object weekly = findByMerchantId((Long) property.get("merchantId")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index d11d7aada..e5d759125 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -178,7 +178,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { Map rent = getById(id); //押金 WxBillDeposit depositParam = new WxBillDeposit(); - depositParam.setRentContractId(id); + depositParam.setRentContractId((Long) rent.get("rentContractId")); Map deposit = wxBillDepositMapper.queryBillDepositList(depositParam).get(0); //周期 Object weekly = findByMerchantId((Long) rent.get("merchantId")); diff --git a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml index 0b3c4c9e6..e736ab78d 100644 --- a/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillPropertyMapper.xml @@ -78,7 +78,8 @@ br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,br.`period`, br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime, - d.receive_pay deposit,case when br.late_pay_time is null then 0 else + br.`property_contract_id` propertyContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 + else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, (select max(period) from wx_bill_property where id=br.id) allPeriod,d.`status` depositStatus from wx_bill_property br left join wx_merchant m on br.merchant_id=m.id diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index 780a99c40..5435a9bc0 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -79,7 +79,7 @@ br.`need_pay` needPay,m.`name` merchantName,s.shop_number shopNumber,br.`updatetime`, br.`merchant_id` merchantId,br.`rent_shop_type` rentShopType,r.type rentType,r.pay_ratio payRatio, br.`revenue`,br.`late_pay_ratio` latePayRatio,br.`late_pay_time` latePayTime,br.`period`, - d.receive_pay deposit,case when br.late_pay_time is null then 0 else + br.`rent_contract_id` rentContractId,d.receive_pay deposit,case when br.late_pay_time is null then 0 else FLOOR(DATEDIFF(now(),br.late_pay_time)*br.late_pay_ratio/10000*br.owe) end latePayPrice, (select max(period) from wx_bill_rent where id=br.id) allPeriod,d.`status` depositStatus from wx_bill_rent br left join wx_merchant m on br.merchant_id=m.id