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);