From a3ead770c30b310b9b1b7e3786d5d847da540e55 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:21:20 +0800
Subject: [PATCH] 2.0.6
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 2ff91bc..beac9a0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -318,16 +318,16 @@
@Override
public long queryCount(Integer userState, String key, Integer keyType, String userRank, Integer days,
- String startTime, String endTime) {
- return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime);
+ String startTime, String endTime,Integer userType) {
+ return userInfoMapper.queryCount(userState, key, keyType, userRank, days, startTime, endTime,userType);
}
@Override
public List<UserInfoVO> query(long start, int count, Integer userState, String key, Integer keyType,
- String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode) {
+ String userRank, Integer days, String startTime, String endTime, Integer orderField, Integer orderMode,Integer userType) {
List<UserInfoVO> userList = userInfoMapper.query(start, count, userState, key, keyType, userRank, days,
- startTime, endTime, orderField, orderMode);
+ startTime, endTime, orderField, orderMode,userType);
if (userList == null || userList.size() == 0) {
return null;
@@ -515,8 +515,8 @@
* @return
*/
@Override
- public UserInfo getInfoByPhoneOrInviteCode(String phone, String inviteCode) {
- return userInfoMapper.getInfoByPhoneOrInviteCode(phone, inviteCode);
+ public UserInfo getUserInfoByInviteCode(String inviteCode) {
+ return userInfoMapper.getUserInfoByInviteCode(inviteCode);
}
@Override
--
Gitblit v1.8.0