From e1ba8e522785a6dafe70ad7b86df501901a00492 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 17 Jan 2022 10:51:51 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=81.test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/service/impl/WxCouponOrderServiceImpl.java | 7 ++++++- .../com/iformall/service/impl/WxCouponSendServiceImpl.java | 4 +++- .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) 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 e071736d8..1fcd58808 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -338,6 +338,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { pageInfo.setPageNum(couponOrderPage.getPageNum()); pageInfo.setPageSize(couponOrderPage.getPageSize()); pageInfo.setPages(couponOrderPage.getPages()); + pageInfo.setTotal(couponOrderPage.getTotal()); return pageInfo; } @@ -370,6 +371,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { pageInfo.setPageNum(couponOrderPage.getPageNum()); pageInfo.setPageSize(couponOrderPage.getPageSize()); pageInfo.setPages(couponOrderPage.getPages()); + pageInfo.setTotal(couponOrderPage.getTotal()); return pageInfo; } @@ -537,6 +539,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cvoPageInfo.setPageNum(pageInfo.getPageNum()); cvoPageInfo.setPageSize(pageInfo.getPageSize()); cvoPageInfo.setPages(pageInfo.getPages()); + cvoPageInfo.setTotal(pageInfo.getTotal()); return cvoPageInfo; } @@ -699,6 +702,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { retPageInfo.setPageSize(pageInfo.getPageSize()); retPageInfo.setList(couponOrderListToCarVoList(wxCouponOrder,pageInfo.getList())); retPageInfo.setPages(pageInfo.getPages()); + retPageInfo.setTotal(pageInfo.getTotal()); return retPageInfo; } @@ -2140,7 +2144,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { retPageInfo.setPageNum(pageInfo.getPageNum()); retPageInfo.setPageSize(pageInfo.getPages()); retPageInfo.setPages(pageInfo.getPages()); - retPageInfo.setList(couponOrderToCardCVoList(record,pageInfo.getList()));; + retPageInfo.setList(couponOrderToCardCVoList(record,pageInfo.getList())); + retPageInfo.setTotal(pageInfo.getTotal()); return new ResultData(retPageInfo); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index fd42c2170..1d3c16b01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -128,6 +128,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { pageInfo.setPageNum(sendPageInfo.getPageNum()); pageInfo.setPageSize(sendPageInfo.getPageSize()); pageInfo.setPages(sendPageInfo.getPages()); + pageInfo.setTotal(sendPageInfo.getTotal()); pageInfo.setList(couponSendToVoList(record,sendPageInfo.getList(),true,false)); } else { record.setStatus(EnumCouponSendStatus.VALID.getCode()); @@ -136,7 +137,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { pageInfo = new PageInfo(); pageInfo.setPageNum(sendPageInfo.getPageNum()); pageInfo.setPageSize(sendPageInfo.getPageSize()); - pageInfo.setPages(sendPageInfo.getPages()); + pageInfo.setPages(sendPageInfo.getPages()); + pageInfo.setTotal(sendPageInfo.getTotal()); pageInfo.setList(couponSendToVoList(record,sendPageInfo.getList(),false,true)); } return pageInfo; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index f12c0ef1a..56f3d6045 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -325,6 +325,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { retPageInfo.setPageNum(pageInfo.getPageNum()); retPageInfo.setPageSize(pageInfo.getPageSize()); retPageInfo.setPages(pageInfo.getPages()); + retPageInfo.setTotal(pageInfo.getTotal()); retPageInfo.setList(creditHistoryToVoList(wxCreditHistory,pageInfo.getList())); return retPageInfo; }