From d5c2554ebae75afbff31c3c2966cc3a747ba941c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 27 四月 2020 15:00:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserLevelUpgradedNotifyServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserLevelUpgradedNotifyServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserLevelUpgradedNotifyServiceImpl.java
index 2580f16..c20268c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserLevelUpgradedNotifyServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserLevelUpgradedNotifyServiceImpl.java
@@ -60,19 +60,26 @@
if (notify == null)
return;
// 鏌ヨ浣庣瓑绾х殑鏄惁宸茶,濡傝嫢鏈鍒欒涓哄凡璇�
- if (notify.getToLevel() == UserLevelEnum.highVIP || notify.getToLevel() == UserLevelEnum.superVIP) {
+ if (notify.getToLevel() == UserLevelEnum.superVIP || notify.getToLevel() == UserLevelEnum.tearcher) {
List<UserLevelEnum> levels = new ArrayList<>();
- if (notify.getToLevel() == UserLevelEnum.superVIP) {
+ if (notify.getToLevel() == UserLevelEnum.tearcher) {
+ levels.add(UserLevelEnum.highVIP);
+ levels.add(UserLevelEnum.superVIP);
+ } else if (notify.getToLevel() == UserLevelEnum.superVIP) {
levels.add(UserLevelEnum.highVIP);
}
- List<UserLevelUpgradedNotify> list = userLevelUpgradedNotifyDao.listToLevelsByUid(notify.getUid(), levels);
- if (list != null)
- for (UserLevelUpgradedNotify item : list) {
- item.setValid(false);
- item.setUpdateTime(new Date());
- userLevelUpgradedNotifyDao.save(item);
- }
+ if (levels.size() > 0) {
+
+ List<UserLevelUpgradedNotify> list = userLevelUpgradedNotifyDao.listToLevelsByUid(notify.getUid(),
+ levels);
+ if (list != null)
+ for (UserLevelUpgradedNotify item : list) {
+ item.setValid(false);
+ item.setUpdateTime(new Date());
+ userLevelUpgradedNotifyDao.save(item);
+ }
+ }
}
notify.setUpdateTime(new Date());
notify.setNotified(true);
--
Gitblit v1.8.0