|
|
|
@@ -156,16 +156,15 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill |
|
|
|
@Override |
|
|
|
public PageInfo<WxAllBill> listAsPage(WxAllBill record, Integer pageIndex, Integer pageSize) { |
|
|
|
updateQueryParam(record); |
|
|
|
PageInfo<WxAllBill> billRentList = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxAllBillMapper.findList(record)); |
|
|
|
if (null == billRentList) { |
|
|
|
PageInfo<WxAllBill> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxAllBillMapper.findList(record)); |
|
|
|
if (null == page) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
Map<Long,WxRentContract> rentContractMap = new HashMap<Long,WxRentContract>(); |
|
|
|
if (null != billRentList.getList()) { |
|
|
|
if (null != page.getList() && page.getList().size() > 0 ) { |
|
|
|
|
|
|
|
List<Long> merchantIds = new ArrayList<Long>(); |
|
|
|
for (int i = 0 ; i < billRentList.getList().size() ; i ++) { |
|
|
|
WxAllBill ab = billRentList.getList().get(i); |
|
|
|
for (int i = 0 ; i < page.getList().size() ; i ++) { |
|
|
|
WxAllBill ab = page.getList().get(i); |
|
|
|
merchantIds.add(ab.getMerchantId()); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -178,8 +177,8 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill |
|
|
|
WxEnergyFees fq = new WxEnergyFees(); |
|
|
|
fq.updateTenantInfo(record); |
|
|
|
Map<Long, WxEnergyFees> feesMap = wxEnergyService.getFeesMap(fq); |
|
|
|
for (int i = 0 ; i < billRentList.getList().size() ; i ++) { |
|
|
|
WxAllBill e = billRentList.getList().get(i); |
|
|
|
for (int i = 0 ; i < page.getList().size() ; i ++) { |
|
|
|
WxAllBill e = page.getList().get(i); |
|
|
|
if (null != shopNumberMap) { |
|
|
|
e.setShopNumber(shopNumberMap.get(e.getMerchantId())); |
|
|
|
} |
|
|
|
@@ -197,7 +196,7 @@ public class WxAllBillServiceImpl extends WxBillBaseService implements WxAllBill |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return billRentList; |
|
|
|
return page; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
|