修改bug
This commit is contained in:
parent
101375930c
commit
95854beff1
@ -209,7 +209,10 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
for (ActiveFullminus activeFullminus : activeFullminusList) {
|
for (ActiveFullminus activeFullminus : activeFullminusList) {
|
||||||
MaxoutVO maxoutVO = new MaxoutVO();
|
MaxoutVO maxoutVO = new MaxoutVO();
|
||||||
// 会员等级判断、符合油号判断
|
// 会员等级判断、符合油号判断
|
||||||
if (activeFullminus.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) &&
|
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.getAdaptOil().contains(String.valueOf(transferDTO.getOilName())) &&
|
||||||
activeFullminus.getActiveStartTime().getTime() <= new Date().getTime() &&
|
activeFullminus.getActiveStartTime().getTime() <= new Date().getTime() &&
|
||||||
new Date().getTime() <= activeFullminus.getActiveEndTime().getTime()) {
|
new Date().getTime() <= activeFullminus.getActiveEndTime().getTime()) {
|
||||||
@ -223,6 +226,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
maxoutVOArrayList.add(maxoutVO);
|
maxoutVOArrayList.add(maxoutVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
//构造折扣券查询条件
|
//构造折扣券查询条件
|
||||||
LambdaQueryWrapper<ActiveDiscount> discountLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<ActiveDiscount> discountLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
@ -235,6 +240,10 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
//获取兑换物品信息
|
//获取兑换物品信息
|
||||||
for (ActiveDiscount activeDiscount : activeDiscountList) {
|
for (ActiveDiscount activeDiscount : activeDiscountList) {
|
||||||
MaxoutVO maxoutVO = new MaxoutVO();
|
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())) &&
|
if (activeDiscount.getDieselUserLevel().contains(String.valueOf(userGradeService.selectUserGradeById(transferDTO.getGradeId()).getId())) &&
|
||||||
activeDiscount.getAdaptOil().contains(String.valueOf(transferDTO.getOilName()))&&
|
activeDiscount.getAdaptOil().contains(String.valueOf(transferDTO.getOilName()))&&
|
||||||
@ -250,6 +259,8 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
maxoutVOArrayList.add(maxoutVO);
|
maxoutVOArrayList.add(maxoutVO);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return maxoutVOArrayList;
|
return maxoutVOArrayList;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,7 +273,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
|
|||||||
}
|
}
|
||||||
recordLambdaQueryWrapper.eq(CardFavorableRecord::getStoreId,transferDTO.getStoreId());
|
recordLambdaQueryWrapper.eq(CardFavorableRecord::getStoreId,transferDTO.getStoreId());
|
||||||
recordLambdaQueryWrapper.eq(CardFavorableRecord::getStatus,"0");
|
recordLambdaQueryWrapper.eq(CardFavorableRecord::getStatus,"0");
|
||||||
List<CardFavorableRecord> list = cardFavorableRecordService.list();
|
List<CardFavorableRecord> list = cardFavorableRecordService.list(recordLambdaQueryWrapper);
|
||||||
//筛查优惠券
|
//筛查优惠券
|
||||||
ArrayList<ExchangeFavorableVO> exchangeFavorableVOArrayList = new ArrayList<>();
|
ArrayList<ExchangeFavorableVO> exchangeFavorableVOArrayList = new ArrayList<>();
|
||||||
for (CardFavorableRecord cardFavorableRecord : list) {
|
for (CardFavorableRecord cardFavorableRecord : list) {
|
||||||
|
Loading…
Reference in New Issue
Block a user