Merge remote-tracking branch 'origin/feature/0712_vip' into feature/0712_vip

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/VipCardRecordServiceImpl.java

@@ -258,6 +258,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
             .in(VipCardRecord::getUserId, userId)
             .eq(VipCardRecord::getEfficientFlag, true)
             .eq(VipCardRecord::getClientType, clientEnum.name())
+            .in(VipCardRecord::getVipType, Lists.newArrayList(EVipType.VIP,EVipType.SVIP))
             .and(wrapper -> wrapper
                 .gt(VipCardRecord::getEndTime, new Date())
                 .or()