From 40d0d99fb89665e6e7702ea62e45fabe2d01e51a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 五月 2021 14:29:52 +0800
Subject: [PATCH] Merge branch 'master' of ssh://193.112.35.168:29418/tejia
---
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java b/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
index 6877861..713b42f 100644
--- a/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
+++ b/service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
@@ -136,7 +136,7 @@
public VipGradePotence getVipPotence(String uid) {
VipGradePotence potence = null;
VipCenter vipCenter = vipCenterMapper.getByUid(uid);
- if (vipCenter != null || vipCenter.getGradeId() != null) {
+ if (vipCenter != null && vipCenter.getGradeId() != null) {
long nowTime = java.lang.System.currentTimeMillis();
if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
potence = vipGradePotenceService.getPotenceByGradeId(vipCenter.getGradeId());
--
Gitblit v1.8.0