dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
@QQNZX 2023-11-21 13:40:21 +08:00
commit 2f229c225f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

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