|
@@ -301,7 +301,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
|
|
|
if (CollectionUtils.isNotEmpty(svipList)) {
|
|
|
userVip.setVipType(EVipType.SVIP);
|
|
|
|
|
|
- Optional<VipCardRecord> first = svipList.stream().filter(o -> o.getEndTime() == null).findFirst();
|
|
|
+ Optional<VipCardRecord> first = svipList.stream().filter(o -> o.getEndTime() == null && o.getType()==PeriodEnum.PERPETUAL).findFirst();
|
|
|
if (first.isPresent()) {
|
|
|
userVip.setVipType(EVipType.PERMANENT_SVIP);
|
|
|
} else {
|