Merge remote-tracking branch 'origin/master'

This commit is contained in:
@QQNZX 2023-11-21 13:40:21 +08:00
commit 2f229c225f

View File

@ -216,9 +216,11 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
cardFavorableLambdaQueryWrapper.in(CardFavorable::getOilType,transferDTO.getOilName());
cardFavorableLambdaQueryWrapper.le(CardFavorable::getSatisfiedAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters());
List<CardFavorable> list1 = cardFavorableService.list(cardFavorableLambdaQueryWrapper);
if (list1.size()>0){
BeanUtils.copyProperties(list1.get(0), exchangeFavorableVO);
exchangeFavorableVOArrayList.add(exchangeFavorableVO);
}
}
return exchangeFavorableVOArrayList;
}
}