Sfoglia il codice sorgente

[账单][修改][查询明细]

release_toaliyun_real
gongbiao 7 anni fa
committed by Stormeye Wu
parent
commit
c43503832f
2 ha cambiato i file con 10 aggiunte e 4 eliminazioni
  1. +5
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java
  2. +5
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java

+ 5
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java Vedi File

@@ -189,7 +189,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService {
//押金 //押金
WxBillPropertyDeposit depositParam = new WxBillPropertyDeposit(); WxBillPropertyDeposit depositParam = new WxBillPropertyDeposit();
depositParam.setPropertyContractId((Long) property.get("propertyContractId")); depositParam.setPropertyContractId((Long) property.get("propertyContractId"));
Map<String, Object> deposit = wxBillPropertyDepositMapper.queryBillDepositList(depositParam).get(0);
Map<String, Object> deposit = null;
List<Map<String, Object>> billDepositList = wxBillPropertyDepositMapper.queryBillDepositList(depositParam);
if (!billDepositList.isEmpty()) {
deposit = billDepositList.get(0);
}
Map<String, Object> result = new HashMap<>(2); Map<String, Object> result = new HashMap<>(2);
result.put("property", property); result.put("property", property);
result.put("deposit", deposit); result.put("deposit", deposit);


+ 5
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java Vedi File

@@ -188,13 +188,15 @@ public class WxBillRentServiceImpl implements WxBillRentService {
//押金 //押金
WxBillDeposit depositParam = new WxBillDeposit(); WxBillDeposit depositParam = new WxBillDeposit();
depositParam.setRentContractId((Long) rent.get("rentContractId")); 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); Map<String, Object> result = new HashMap<>(3);
result.put("rent", rent); result.put("rent", rent);
result.put("deposit", deposit); result.put("deposit", deposit);
//result.put("weekly", weekly);
return result; return result;
} }




Caricamento…
Annulla
Salva