From b47f8a03db79bb1f6356479cd8a5cf190d7d9694 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 23 六月 2021 11:10:36 +0800
Subject: [PATCH] 礼金功能完善
---
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 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 713b42f..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
@@ -139,7 +139,23 @@
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