| @@ -800,19 +800,19 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| handleWxCouponOrderBVoQueryParam(wxCouponOrderBVo); | handleWxCouponOrderBVoQueryParam(wxCouponOrderBVo); | ||||
| PageInfo<WxCouponOrder> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); | PageInfo<WxCouponOrder> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); | ||||
| PageInfo<WxCouponOrderBVo> retPageInfo = new PageInfo<WxCouponOrderBVo>(); | |||||
| retPageInfo.setPageNum(pageIndex); | |||||
| retPageInfo.setPageSize(pageSize); | |||||
| retPageInfo.setPages(pageInfo.getPages()); | |||||
| if (null != pageInfo && null != pageInfo.getList()){ | |||||
| List<WxCouponOrderBVo> volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); | |||||
| retPageInfo.setList(volist); | |||||
| } | |||||
| List<WxCouponOrderBVo> volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); | |||||
| PageHelper.startPage(pageIndex, pageSize); | |||||
| PageInfo<WxCouponOrderBVo> retPageInfo = new PageInfo(volist); | |||||
| pageInfo.setPages(pageInfo.getPages()); | |||||
| pageInfo.setTotal(pageInfo.getTotal()); | |||||
| PageHelper.clearPage(); | |||||
| return new ResultData(retPageInfo); | return new ResultData(retPageInfo); | ||||
| } | } | ||||
| private List<WxCouponOrderBVo> handleQueryResult(List<WxCouponOrder> list,TenantEntity tenantEntity) { | private List<WxCouponOrderBVo> handleQueryResult(List<WxCouponOrder> list,TenantEntity tenantEntity) { | ||||
| if (null != list ) { | |||||
| if (null != list && list.size() > 0) { | |||||
| WxMerchant merchantQ = new WxMerchant(); | WxMerchant merchantQ = new WxMerchant(); | ||||
| merchantQ.updateTenantInfo(tenantEntity); | merchantQ.updateTenantInfo(tenantEntity); | ||||