diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java index de88c40..4fa3354 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbShopCouponServiceImpl.java @@ -157,13 +157,15 @@ public class TbShopCouponServiceImpl implements TbShopCouponService { } } else { List tbShopUser = shopUserMapper.selectAllByUserId(param.getUserId().toString()); - List ids = tbShopUser.stream().map(TbShopUser::getId).map(Integer::valueOf).collect(Collectors.toList()); - if (param.getStatus().equals(1)) { - return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopId(ids, param.getShopId())); - } else if (param.getStatus().equals(-1)) { - return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopIdExpire(ids, param.getShopId())); - } else if (param.getStatus().equals(2)) { - return new Result(CodeEnum.SUCCESS, outRecordMapper.queryByVipIdAndShopId(ids, param.getShopId())); + if(CollectionUtil.isNotEmpty(tbShopUser)){ + List ids = tbShopUser.stream().map(TbShopUser::getId).map(Integer::valueOf).collect(Collectors.toList()); + if (param.getStatus().equals(1)) { + return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopId(ids, param.getShopId())); + } else if (param.getStatus().equals(-1)) { + return new Result(CodeEnum.SUCCESS, inRecordMapper.queryByVipIdAndShopIdExpire(ids, param.getShopId())); + } else if (param.getStatus().equals(2)) { + return new Result(CodeEnum.SUCCESS, outRecordMapper.queryByVipIdAndShopId(ids, param.getShopId())); + } } } return new Result(CodeEnum.SUCCESS);