From afe61a27c4f77db65df66b0ff5dc93cbd3e0014b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 六月 2020 17:49:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java
index bb39db3..ebbef9c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/GiveVIPApplyInfoServiceImpl.java
@@ -184,13 +184,13 @@
userAccountMsgNotificationService
.artificialVipUpgradeReject(uid,
preInfo == null ? UserLevelEnum.daRen.getName()
- : UserLevelUtil.getByLevel(preInfo.getProcess()).getName(),
+ :UserLevelUtil.getShowLevel(UserLevelUtil.getByLevel(preInfo.getProcess())).getName(),
info.getLevel().getName(), reason);
}
@Override
public List<GiveVIPApplyInfo> listBySourceUid(Long uid, int page, int pageSize) {
- return giveVIPApplyInfoDao.listBySourceUid(uid, null, (page - 1) * pageSize, 1);
+ return giveVIPApplyInfoDao.listBySourceUid(uid, null, (page - 1) * pageSize, pageSize);
}
@Override
--
Gitblit v1.8.0