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 334cc274c..e071736d8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -954,7 +954,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } return retList; } - return new ArrayList<>(); + return new ArrayList(); } @@ -2735,11 +2735,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { merchantIds.add(record.getMerchantId()); List couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); if (null == couponIds || couponIds.isEmpty()) { - retPageInfo.setList(new ArrayList<>()); retPageInfo.setPageNum(pageIndex); retPageInfo.setPageSize(pageSize); retPageInfo.setPages(0); retPageInfo.setTotal(0); + retPageInfo.setList(new ArrayList()); return retPageInfo; } //查询商户下的券