Browse Source

/、.test

release_toaliyun_real
xhxu 4 years ago
parent
commit
232f3fc99d
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java View File

@@ -954,7 +954,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}
return retList;
}
return new ArrayList<>();
return new ArrayList<WxCouponOrderBVo>();
}
@@ -2735,11 +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);
retPageInfo.setList(new ArrayList<WxCouponOrderBVo>());
return retPageInfo;
}
//查询商户下的券


Loading…
Cancel
Save