Commit 4724543d by wuwenlong

Merge branch 'dev' into test

parents 3656a228 ef957780
...@@ -265,7 +265,7 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe ...@@ -265,7 +265,7 @@ public class SConsumerCouponServiceImpl extends ServiceImpl<SConsumerCouponMappe
if(!CollectionUtils.isEmpty(packs)){ if(!CollectionUtils.isEmpty(packs)){
List<String> packNames = packs.stream().map(SPack::getName).distinct().collect(Collectors.toList()); List<String> packNames = packs.stream().map(SPack::getName).distinct().collect(Collectors.toList());
item.setIsAvailable(AvailableEnum.UNAVAILABLE.getCode()); item.setIsAvailable(AvailableEnum.UNAVAILABLE.getCode());
item.setReason("优惠卷当前套餐不可用,【"+packNames.toString()+"】套餐可用"); item.setReason("优惠卷当前套餐不可用,"+packNames.toString()+"套餐可用");
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment