|
|
|
@@ -806,10 +806,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
retPageInfo.setPageSize(pageSize); |
|
|
|
retPageInfo.setPages(pageInfo.getPages()); |
|
|
|
retPageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
if (null != pageInfo && null != pageInfo.getList()){ |
|
|
|
List<WxCouponOrderBVo> volist = handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); |
|
|
|
retPageInfo.setList(volist); |
|
|
|
} |
|
|
|
retPageInfo.setList(handleQueryResult(pageInfo.getList(), wxCouponOrderBVo)); |
|
|
|
|
|
|
|
return new ResultData(retPageInfo); |
|
|
|
} |
|
|
|
@@ -957,7 +954,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
} |
|
|
|
return retList; |
|
|
|
} |
|
|
|
return null; |
|
|
|
return new ArrayList<>(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@@ -2738,9 +2735,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
merchantIds.add(record.getMerchantId()); |
|
|
|
List<Long> 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); |
|
|
|
return retPageInfo; |
|
|
|
} |
|
|
|
//查询商户下的券 |
|
|
|
@@ -2749,10 +2748,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { |
|
|
|
retPageInfo.setPageNum(pageIndex); |
|
|
|
retPageInfo.setPageSize(pageSize); |
|
|
|
retPageInfo.setPages(pageInfo.getPages()); |
|
|
|
if (null != pageInfo && null != pageInfo.getList()){ |
|
|
|
List<WxCouponOrderBVo> volist = handleQueryResult(pageInfo.getList(), record); |
|
|
|
retPageInfo.setList(volist); |
|
|
|
} |
|
|
|
retPageInfo.setTotal(pageInfo.getTotal()); |
|
|
|
retPageInfo.setList(handleQueryResult(pageInfo.getList(), record)); |
|
|
|
return retPageInfo; |
|
|
|
|
|
|
|
} |
|
|
|
|