Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
ad3be6a7eb
1 changed files with 21 additions and 18 deletions
  1. +21
    -18
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 21
- 18
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -837,35 +837,38 @@ public class WxRentContractController extends WxContractBaseController {
bq.setNoExtraCreateFrom(EnumYesOrNo.YES.getCode());
bq.setSortColumn(" starttime asc");
List<WxAllBill> billList = wxAllBillService.list(bq);
if (null == billList || billList.size() <= 0 ) {
return new ResultData();
}
List<WxAllBill> validBillList = new ArrayList<WxAllBill>();
WxRentContract rc = new WxRentContract();
rc.updateTenantInfo(sales);
rc.setId(sales.getRentContractId());
List<WxRentContractRevenueSales> salesList = wxRentContractService.getContractSales(rc);
if (null != salesList && salesList.size() > 0 && null != billList && billList.size() > 0 ) {
Map<Long,WxRentContractRevenueSales> billSalesMap = new HashMap<Long,WxRentContractRevenueSales>();
Map<Long,WxRentContractRevenueSales> billSalesMap = new HashMap<Long,WxRentContractRevenueSales>();
if (null != salesList && salesList.size() > 0) {
for (int i = 0 ; i < salesList.size() ; i ++ ) {
WxRentContractRevenueSales rs = salesList.get(i);
billSalesMap.put(rs.getBillId(), rs);
}
for (int i = 0 ; i < billList.size() ; i ++) {
WxAllBill bill = billList.get(i);
WxRentContractRevenueSales s = billSalesMap.get(bill.getId());
if (null != s) {
bill.setSales(s.getSaleMoney());
bill.setSalesTime(s.getUpdateTime());
if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) {
//
}else {
validBillList.add(bill);
}
}else {
validBillList.add(bill);
}
}
}
for (int i = 0 ; i < billList.size() ; i ++) {
WxAllBill bill = billList.get(i);
WxRentContractRevenueSales s = billSalesMap.get(bill.getId());
if (null != s) {
bill.setSales(s.getSaleMoney());
bill.setSalesTime(s.getUpdateTime());
if (s.getIsConfirm() == EnumYesOrNo.YES.getCode()) {
//
}else {
validBillList.add(bill);
}
}else {
validBillList.add(bill);
}
}
return new ResultData(validBillList);
}


Loading…
Cancel
Save