From b4a195f07fc3c0c417d9bb2f06acf76f5a62f29e Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 29 五月 2021 16:33:06 +0800
Subject: [PATCH] 会员权益
---
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..2b9474f 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,10 +136,26 @@
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());
+ potence = vipGradePotenceService.getCurrentByGradeId(vipCenter.getGradeId());
+ }
+ }
+ if (potence == null) {
+ potence = vipGradePotenceService.getDefaultGradePotence();
+ }
+ return potence;
+ }
+
+ @Override
+ public VipGradePotence getVipPotenceByTime(String uid, Date time) {
+ VipGradePotence potence = null;
+ VipCenter vipCenter = vipCenterMapper.getByUid(uid);
+ if (vipCenter != null && vipCenter.getGradeId() != null) {
+ long nowTime = java.lang.System.currentTimeMillis();
+ if (vipCenter.getStartTime().getTime() <= nowTime && vipCenter.getEndTime().getTime() >= nowTime) {
+ potence = vipGradePotenceService.getByGradeIdAndTime(vipCenter.getGradeId(), time);
}
}
if (potence == null) {
--
Gitblit v1.8.0