From 232f3fc99d5d65e7224c92dc30f0c26a1f0dfd5e Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 16 Jan 2022 19:39:46 +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 | 4 ++-- 1 file changed, 2 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 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; } //查询商户下的券