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 a72e0cb95..88c09a4d5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -801,11 +801,15 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); - List volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); - PageHelper.startPage(pageIndex, pageSize); - PageInfo retPageInfo = new PageInfo(volist); - pageInfo.setPages(pageInfo.getPages()); + PageInfo retPageInfo = new PageInfo(); + retPageInfo.setPageNum(pageIndex); + retPageInfo.setPageSize(pageSize); + retPageInfo.setPages(pageInfo.getPages()); pageInfo.setTotal(pageInfo.getTotal()); + if (null != pageInfo && null != pageInfo.getList()){ + List volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); + retPageInfo.setList(volist); + } return new ResultData(retPageInfo); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index be53eb772..efa0f6460 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -834,15 +834,14 @@ and co.order_id = #{orderId} - - - order by ${sortColumns} - order co.id desc + + + order co.update_date desc