From 2ec42a5aacea35d2918f0e17f07685cf5b4d25c8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 12 五月 2020 20:20:41 +0800
Subject: [PATCH] 包名引用路径更改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
index 167059e..177ac29 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/vip/UserVIPPreInfoServiceImpl.java
@@ -96,7 +96,7 @@
 
 	@Override
 	public void addUserVIPPreInfo(UserVIPPreInfo info) throws UserVIPPreInfoException {
-		if (info == null || info.getUid() == null || info.getProcess() == null)
+		if (info == null || info.getUid() == null || info.getProcess() == null || info.getSourceType() == null)
 			throw new UserVIPPreInfoException(1, "淇℃伅涓嶅畬鏁�");
 		for (Long fuid : Constant.NO_UPGRADE_UIDS) {// 绂佹涓嶈兘鍗囩骇鐨勭敤鎴峰崌绾�
 			if (info.getUid().longValue() == fuid)
@@ -277,6 +277,11 @@
 		info.setProcess(UserVIPPreInfo.PROCESS_2);
 		info.setCreateTime(upgradeTime);
 		info.setUpdateTime(upgradeTime);
+		if (teamPass)
+			info.setSourceType(UserVIPPreInfo.SOURCE_TYPE_TEAM);
+		else
+			info.setSourceType(UserVIPPreInfo.SOURCE_TYPE_ORDER);
+
 		addUserVIPPreInfo(info);
 
 		// 鍗囩骇寮规鎻愮ず
@@ -328,4 +333,14 @@
 		userVIPPreInfoMapper.deleteByPrimaryKey(id);
 	}
 
+	@Override
+	public List<UserVIPPreInfo> listByProcess(int process, Date minTime, Date maxTime, int page, int pageSize) {
+		return userVIPPreInfoMapper.listByProcess(process, minTime, maxTime, (page - 1) * pageSize, pageSize);
+	}
+
+	@Override
+	public long countByProcess(int process, Date minTime, Date maxTime) {
+		return userVIPPreInfoMapper.countByProcess(process, minTime, maxTime);
+	}
+
 }

--
Gitblit v1.8.0