From 9056fdeb1eba53ebd1dbb2dc1a283acf595b7494 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 15 五月 2021 18:04:52 +0800
Subject: [PATCH] 修改

---
 service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 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 e88f5c1..d09213b 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
@@ -4,6 +4,7 @@
 import com.ks.vip.mapper.VipCenterMapper;
 import com.ks.vip.mapper.VipComboMapper;
 import com.ks.vip.pojo.DO.*;
+import com.ks.vip.pojo.Enums.VIPEnum;
 import com.ks.vip.query.VipCenterQuery;
 import com.ks.vip.query.VipComboQuery;
 import com.ks.vip.service.*;
@@ -123,42 +124,44 @@
     }
 
 
-    @Override
-    public boolean verifyVIP(String uid) {
-        VipCenter vipCenter = vipCenterMapper.getByUid(uid);
-        if (vipCenter == null) {
-            return false;
-        }
-        // 楠岃瘉浼氬憳鏄惁鏈夋晥
-        long nowTime = java.lang.System.currentTimeMillis();
-        if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
-            return true;
-        }
-        return false;
-    }
+
 
     @Override
     public VipGradePotence getVipPotence(String uid) {
+        VipGradePotence potence = null;
         VipCenter vipCenter = vipCenterMapper.getByUid(uid);
-        if (vipCenter == null || vipCenter.getGradeId() == null) {
-            return 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());
+            }
         }
-
-        long nowTime = java.lang.System.currentTimeMillis();
-        if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
-            return vipGradePotenceService.selectByPrimaryKey(vipCenter.getGradeId());
+        if (potence == null) {
+            potence = vipGradePotenceService.getDefaultGradePotence();
         }
-        return null;
+        return potence;
     }
 
 
     @Override
     public VipGrade getVipGrade(String uid) {
+        VipGrade vipGrade = null;
         VipCenter vipCenter = vipCenterMapper.getByUid(uid);
-        if (vipCenter == null || vipCenter.getGradeId() == null) {
-            return null;
+        if (vipCenter != null || vipCenter.getGradeId() != null) {
+            long nowTime = java.lang.System.currentTimeMillis();
+            if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
+                vipGrade = vipGradeService.selectByPrimaryKey(vipCenter.getGradeId());
+            }
         }
-        return vipGradeService.selectByPrimaryKey(vipCenter.getGradeId());
+        if (vipGrade == null) {
+            vipGradeService.getDefaultGrade();
+        }
+        return vipGrade;
     }
 
-}
+    @Override
+    public VIPEnum getVIPEnumByUid(String uid) {
+        VipGrade vipGrade = getVipGrade(uid);
+        return vipGrade.getIdentity();
+    }
+}
\ No newline at end of file

--
Gitblit v1.8.0