| @@ -954,7 +954,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| return retList; | return retList; | ||||
| } | } | ||||
| return new ArrayList<>(); | |||||
| return new ArrayList<WxCouponOrderBVo>(); | |||||
| } | } | ||||
| @@ -2735,11 +2735,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| merchantIds.add(record.getMerchantId()); | merchantIds.add(record.getMerchantId()); | ||||
| List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); | List<Long> couponIds = wxCouponMerchantMapper.findMerchantProductIds(record.getTenantId(),merchantIds,null); | ||||
| if (null == couponIds || couponIds.isEmpty()) { | if (null == couponIds || couponIds.isEmpty()) { | ||||
| retPageInfo.setList(new ArrayList<>()); | |||||
| retPageInfo.setPageNum(pageIndex); | retPageInfo.setPageNum(pageIndex); | ||||
| retPageInfo.setPageSize(pageSize); | retPageInfo.setPageSize(pageSize); | ||||
| retPageInfo.setPages(0); | retPageInfo.setPages(0); | ||||
| retPageInfo.setTotal(0); | retPageInfo.setTotal(0); | ||||
| retPageInfo.setList(new ArrayList<WxCouponOrderBVo>()); | |||||
| return retPageInfo; | return retPageInfo; | ||||
| } | } | ||||
| //查询商户下的券 | //查询商户下的券 | ||||