From ddf0c02ad0ce8474f6e2d5deab3a52f7297d979a Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 16 Jan 2022 15:59:16 +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 --- .../com/iformall/service/impl/WxCouponOrderServiceImpl.java | 5 ++--- .../iformall/service/impl/WxCreditHistoryServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 4 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 88b4cc3d9..a72e0cb95 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -421,7 +421,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //merchant Map merchantSimpleMap = new HashMap(); - if (null != merchantIdList) { + if (null != merchantIdList && merchantIdList.size() > 0) { WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); merchantQ.setIds(merchantIdList); @@ -806,7 +806,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { PageInfo retPageInfo = new PageInfo(volist); pageInfo.setPages(pageInfo.getPages()); pageInfo.setTotal(pageInfo.getTotal()); - PageHelper.clearPage(); return new ResultData(retPageInfo); } @@ -2732,7 +2731,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List merchantIds = new ArrayList(); merchantIds.add(record.getMerchantId()); List couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); - if (null == couponIds) { + if (null == couponIds || couponIds.isEmpty()) { retPageInfo.setPageNum(pageIndex); retPageInfo.setPageSize(pageSize); retPageInfo.setPages(0); 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 6efd2ef9e..3978f40c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -153,7 +153,7 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { private Map getMerchantNameMap(BaseTenantEntity tenantEntity,List merchantIdList) { Map merchantNameMap = new HashMap(); - if (merchantIdList.size() > 0) { + if (merchantIdList !=null && merchantIdList.size() > 0) { WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); merchantQ.setIds(merchantIdList);