From 8c93d2e3b22ac543f8f94c2cf0eb982258fb708b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 15:33:00 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 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 831a93d..92642e4 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
@@ -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
@@ -650,4 +650,30 @@
userInfoMapper.updateByPrimaryKeySelective(userInfo);
}
+ @Override
+ public List<UserInfo> getAutoExtractUser(int start, int count, BigDecimal minSurplus, String beganDate,
+ String endDate) {
+ return userInfoMapper.getAutoExtractUser(start, count, minSurplus, beganDate, endDate);
+ }
+
+ @Override
+ public List<UserInfo> listByType(int type, int page, int count) {
+ return userInfoMapper.listByType(type, (page - 1) * count, count);
+ }
+
+ @Override
+ public long countByType(int type) {
+ return userInfoMapper.countByType(type);
+ }
+
+ @Override
+ public List<UserInfo> getAutoExtractUserTo1212(int start, int count) {
+ return userInfoMapper.getAutoExtractUserTo1212(start, count);
+ }
+
+ @Override
+ public UserInfo selectAvailableByPrimaryKey(Long uid) {
+ return userInfoMapper.selectAvailableByPrimaryKey(uid);
+ }
+
}
--
Gitblit v1.8.0