|
|
|
@@ -106,6 +106,9 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
PageInfo<WxMerchant> merchantPage = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); |
|
|
|
PageInfo<WxMerchantBillVo> page = new PageInfo<WxMerchantBillVo>(); |
|
|
|
page.setPageNum(pageNum); |
|
|
|
page.setPageSize(pageSize); |
|
|
|
if (null != merchantPage && null != merchantPage.getList() && merchantPage.getList().size() > 0 ) { |
|
|
|
List<WxMerchantBillVo> retList = new ArrayList<WxMerchantBillVo>(); |
|
|
|
for (int i = 0 ; i < merchantPage.getList().size(); i ++) { |
|
|
|
@@ -140,11 +143,15 @@ public class WxBillAllController extends BillBaseController { |
|
|
|
retList.add(vo); |
|
|
|
} |
|
|
|
|
|
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
return new PageInfo<WxMerchantBillVo>(retList); |
|
|
|
page.setPages(merchantPage.getPages()); |
|
|
|
page.setTotal(merchantPage.getTotal()); |
|
|
|
page.setList(retList); |
|
|
|
return page; |
|
|
|
}else { |
|
|
|
page.setPages(1); |
|
|
|
page.setTotal(0); |
|
|
|
} |
|
|
|
PageHelper.startPage(pageNum, pageSize); |
|
|
|
return new PageInfo<WxMerchantBillVo>(new ArrayList<WxMerchantBillVo>()); |
|
|
|
return page; |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|