diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index fb8ad16ae..88b4cc3d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -800,19 +800,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { handleWxCouponOrderBVoQueryParam(wxCouponOrderBVo); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); - PageInfo retPageInfo = new PageInfo(); - retPageInfo.setPageNum(pageIndex); - retPageInfo.setPageSize(pageSize); - retPageInfo.setPages(pageInfo.getPages()); - if (null != pageInfo && null != pageInfo.getList()){ - List volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); - retPageInfo.setList(volist); - } + + List volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); + PageHelper.startPage(pageIndex, pageSize); + PageInfo retPageInfo = new PageInfo(volist); + pageInfo.setPages(pageInfo.getPages()); + pageInfo.setTotal(pageInfo.getTotal()); + PageHelper.clearPage(); + return new ResultData(retPageInfo); } private List handleQueryResult(List list,TenantEntity tenantEntity) { - if (null != list ) { + if (null != list && list.size() > 0) { WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity);