|
|
|
@@ -188,13 +188,15 @@ public class WxBillRentServiceImpl implements WxBillRentService { |
|
|
|
//押金 |
|
|
|
WxBillDeposit depositParam = new WxBillDeposit(); |
|
|
|
depositParam.setRentContractId((Long) rent.get("rentContractId")); |
|
|
|
Map<String, Object> deposit = wxBillDepositMapper.queryBillDepositList(depositParam).get(0); |
|
|
|
Map<String, Object> deposit = null; |
|
|
|
List<Map<String, Object>> billDepositList = wxBillDepositMapper.queryBillDepositList(depositParam); |
|
|
|
if (!billDepositList.isEmpty()) { |
|
|
|
deposit = billDepositList.get(0); |
|
|
|
} |
|
|
|
//周期 |
|
|
|
//Object weekly = findByMerchantId((Long) rent.get("merchantId")); |
|
|
|
Map<String, Object> result = new HashMap<>(3); |
|
|
|
result.put("rent", rent); |
|
|
|
result.put("deposit", deposit); |
|
|
|
//result.put("weekly", weekly); |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
|
|