From 5568c13c047c7936b3ed47cb80b0b7f8964d82db Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Mon, 20 Nov 2023 14:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActiveExchangeServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 1a1699159..846cb55f6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -157,10 +157,10 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { MaxoutVO maxoutVO = new MaxoutVO(); BeanUtils.copyProperties(activeFullminus,maxoutVO); LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); - queryWrappers.eq(ActiveDiscountChild::getActiveDiscountId,activeFullminus.getId()); + queryWrappers.eq(ActiveDiscountChild::getActiveFullminusId,activeFullminus.getId()); //判断符合金额 queryWrappers.le(ActiveDiscountChild::getAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters()); - queryWrappers.orderByDesc(ActiveDiscountChild::getCreateTime); + queryWrappers.orderByDesc(ActiveDiscountChild::getAmount); maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); maxoutVOArrayList.add(maxoutVO); } @@ -184,7 +184,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { queryWrappers.eq(ActiveDiscountChild::getActiveDiscountId,activeDiscount.getId()); //判断符合金额 queryWrappers.le(ActiveDiscountChild::getAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters()); - queryWrappers.orderByDesc(ActiveDiscountChild::getCreateTime); + queryWrappers.orderByDesc(ActiveDiscountChild::getAmount); maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); maxoutVOArrayList.add(maxoutVO); }