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 | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 0ca47c4..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
@@ -77,22 +77,22 @@
@Override
public List<GiveVIPApplyInfo> listByTargetUid(Long uid, int page, int pageSize) {
- return giveVIPApplyInfoDao.list(uid, null, (page - 1) * pageSize, pageSize);
+ return giveVIPApplyInfoDao.listByTargetUid(uid, null, (page - 1) * pageSize, pageSize);
}
@Override
public long countByTargetUid(Long uid) {
- return giveVIPApplyInfoDao.count(uid, null);
+ return giveVIPApplyInfoDao.countByTargetUid(uid, null);
}
@Override
- public List<GiveVIPApplyInfo> listByStateAndTargetUid(Long targetUid,Integer state, int page, int pageSize) {
- return giveVIPApplyInfoDao.list(targetUid, state, (page - 1) * pageSize, pageSize);
+ public List<GiveVIPApplyInfo> listByStateAndTargetUid(Long targetUid, Integer state, int page, int pageSize) {
+ return giveVIPApplyInfoDao.listByTargetUid(targetUid, state, (page - 1) * pageSize, pageSize);
}
@Override
- public long countByStateAndTargetUid(Long targetUid,Integer state) {
- return giveVIPApplyInfoDao.count(targetUid, state);
+ public long countByStateAndTargetUid(Long targetUid, Integer state) {
+ return giveVIPApplyInfoDao.countByTargetUid(targetUid, state);
}
@Override
@@ -107,8 +107,8 @@
if (info == null)
throw new GiveVIPApplyInfoException(1, "璁板綍涓嶅瓨鍦�");
-// if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)
-// throw new GiveVIPApplyInfoException(2, "鐢ㄦ埛鏈彁浜よ祫鏂�");
+ // if (info.getState() == GiveVIPApplyInfo.STATE_NO_INFO)
+ // throw new GiveVIPApplyInfoException(2, "鐢ㄦ埛鏈彁浜よ祫鏂�");
if (info.getState() == GiveVIPApplyInfo.STATE_REJECT)
throw new GiveVIPApplyInfoException(3, "宸茬粡琚嫆缁�");
@@ -184,8 +184,18 @@
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, pageSize);
+ }
+
+ @Override
+ public long countBySourceUid(Long uid) {
+ return giveVIPApplyInfoDao.countBySourceUid(uid, null);
+ }
+
}
--
Gitblit v1.8.0