diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index f648a19cb..01fdeac4e 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -115,7 +115,7 @@ - + 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 894d44575..0475506d8 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 @@ -209,18 +209,23 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { for (ActiveFullminus activeFullminus : activeFullminusList) { MaxoutVO maxoutVO = new MaxoutVO(); // 会员等级判断、符合油号判断 - if (activeFullminus.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) && - activeFullminus.getAdaptOil().contains(String.valueOf(transferDTO.getOilName())) && - activeFullminus.getActiveStartTime().getTime()<=new Date().getTime() && - new Date().getTime()<=activeFullminus.getActiveEndTime().getTime()){ - BeanUtils.copyProperties(activeFullminus,maxoutVO); - LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); - queryWrappers.eq(ActiveDiscountChild::getActiveFullminusId,activeFullminus.getId()); - //判断符合金额 - queryWrappers.le(ActiveDiscountChild::getAmount,transferDTO.getOilPrice() * transferDTO.getOilLiters()); - queryWrappers.orderByDesc(ActiveDiscountChild::getAmount); - maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); - maxoutVOArrayList.add(maxoutVO); + String[] split = activeFullminus.getDieselUserLevel().split(","); + for (String s : split) { + if (transferDTO.getGradeId().equals(Integer.parseInt(s))) { + if (/*activeFullminus.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) &&*/ + activeFullminus.getAdaptOil().contains(String.valueOf(transferDTO.getOilName())) && + activeFullminus.getActiveStartTime().getTime() <= new Date().getTime() && + new Date().getTime() <= activeFullminus.getActiveEndTime().getTime()) { + BeanUtils.copyProperties(activeFullminus, maxoutVO); + LambdaQueryWrapper queryWrappers = new LambdaQueryWrapper<>(); + queryWrappers.eq(ActiveDiscountChild::getActiveFullminusId, activeFullminus.getId()); + //判断符合金额 + queryWrappers.le(ActiveDiscountChild::getAmount, transferDTO.getOilPrice() * transferDTO.getOilLiters()); + queryWrappers.orderByDesc(ActiveDiscountChild::getAmount); + maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); + maxoutVOArrayList.add(maxoutVO); + } + } } } @@ -235,6 +240,10 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { //获取兑换物品信息 for (ActiveDiscount activeDiscount : activeDiscountList) { MaxoutVO maxoutVO = new MaxoutVO(); + String[] split = activeDiscount.getDieselUserLevel().split(","); + for (String s : split) { + if(transferDTO.getGradeId().equals(Integer.parseInt(s))){ + // 会员等级判断、符合油号判断 if (activeDiscount.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) && activeDiscount.getAdaptOil().contains(String.valueOf(transferDTO.getOilName()))&& @@ -249,6 +258,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { maxoutVO.setActiveDiscountChildList(activeDiscountChildService.list(queryWrappers)); maxoutVOArrayList.add(maxoutVO); } + } + } } return maxoutVOArrayList; } @@ -262,7 +273,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { } recordLambdaQueryWrapper.eq(CardFavorableRecord::getStoreId,transferDTO.getStoreId()); recordLambdaQueryWrapper.eq(CardFavorableRecord::getStatus,"0"); - List list = cardFavorableRecordService.list(); + List list = cardFavorableRecordService.list(recordLambdaQueryWrapper); //筛查优惠券 ArrayList exchangeFavorableVOArrayList = new ArrayList<>(); for (CardFavorableRecord cardFavorableRecord : list) {