Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBmBiz.java

@@ -288,4 +288,23 @@ public class ActivityBmBiz extends BaseBiz<ActivityBmMapper, ActivityBm> {
         return  ObjectRestResponse.succ(subscribe);
     }
 
+    //获取用户信息
+    public  ObjectRestResponse getUserInfo(Integer parentId,HttpServletRequest request){
+        JSONObject obj =new JSONObject();
+        obj.put("parentId",0);
+        obj.put("name","");
+        User user=userBiz.getSession(request);
+        if (user!=null){
+            obj.put("parentId",user.getId());
+            obj.put("name",user.getNickName());
+        }
+        if (parentId!=null||parentId>=0){
+            user=userBiz.selectById(parentId);
+            if (user!=null){
+                obj.put("name",user.getNickName());
+            }
+        }
+        return  ObjectRestResponse.succ();
+    }
+
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/UserBiz.java

@@ -209,4 +209,6 @@ public class UserBiz extends BaseBiz<UserMapper, User> {
 
 
 
+
+
 }

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/AuthActivityController.java

@@ -61,5 +61,10 @@ public class AuthActivityController extends BaseController<ActivityBmBiz,Activit
         return activityBmBiz.checkSubscribe(request);
     }
 
+    @GetMapping("app/unauth/userInfo")
+    public ObjectRestResponse userInfo(Integer pId,HttpServletRequest request){
+        return activityBmBiz.getUserInfo(pId,request);
+    }
+
 
 }