From 6c09cbd70388ae53ec593de253f69cfa1a3eeda7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:41:25 +0800
Subject: [PATCH] 活动管理界面完善

---
 service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
index e7aecc9..2b6c3b6 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
@@ -6,6 +6,7 @@
 import com.ks.daylucky.mapper.UserInfoMapper;
 import com.ks.daylucky.pojo.DO.UserInfo;
 import com.ks.daylucky.pojo.DO.UserInfoExtra;
+import com.ks.daylucky.pojo.VO.SimpleUser;
 import com.ks.daylucky.query.UserInfoQuery;
 import com.ks.daylucky.service.UserInfoExtraService;
 import com.ks.daylucky.service.UserInfoService;
@@ -56,7 +57,7 @@
         userInfoMapper.insertSelective(userInfo);
 
         //鍒濆鍖栭檮鍔犱俊鎭�
-        userInfoExtraService.init(userInfo.getId());
+        userInfoExtraService.init(userInfo.getId(), userInfo.getType() == UserInfo.TYPE_NORMAL ? true : false);
         return userInfo.getId();
     }
 
@@ -74,9 +75,11 @@
     }
 
     @Override
-    public List<UserInfo> getUserList(UserInfoQuery query, int page, int pageSize) {
-        query.start = (page - 1) * pageSize;
-        query.count = pageSize;
+    public List<UserInfo> getUserList(UserInfoQuery query, Integer page, Integer pageSize) {
+        if (page != null && pageSize != null) {
+            query.start = (page - 1) * pageSize;
+            query.count = pageSize;
+        }
         return userInfoMapper.list(query);
     }
 
@@ -116,4 +119,13 @@
         userInfo.setUpdateTime(new Date());
         userInfoMapper.updateByPrimaryKeySelective(userInfo);
     }
+
+    @Override
+    public SimpleUser getSimpleUser(Long id) {
+        UserInfo user = userInfoMapper.selectByPrimaryKey(id);
+        if (user == null) {
+            return null;
+        }
+        return new SimpleUser(user.getId(), user.getNickName(), user.getPortrait());
+    }
 }

--
Gitblit v1.8.0