wesmiler 报恩寺项目

app/Services/MemberService.php

@@ -74,30 +74,36 @@ class MemberService extends BaseService
      * @param array $field m用户表
      * @return array
      */
-    public function getUserInfo($where, $field=[]){
-        $field = $field? $field : ['m.id','m.openid','m.invite_id','ms.type','ms.master_type','ms.realname as master_name','ms.status as master_status','m.mobile','m.nickname','m.avatar','m.gender','m.member_level','m.is_vip','m.realname','m.balance','m.salary','m.merits_num','m.coupon','m.score','m.login_time','m.status'];
+    public function getUserInfo($where, $field = [])
+    {
+        $field = $field ? $field : ['m.id', 'm.openid', 'm.invite_id', 'ms.type as mtype', 'ms.master_type', 'ms.realname as master_name', 'ms.status as master_status', 'm.mobile', 'm.nickname', 'm.avatar', 'm.gender', 'm.member_level', 'm.is_vip', 'm.realname', 'm.balance', 'm.salary', 'm.merits_num', 'm.coupon', 'm.score', 'm.login_time', 'm.status'];
         $info = $this->model::from('member as m')
-            ->leftJoin('member_level as ml','ml.id','=','m.member_level')
-            ->leftJoin('master as ms','ms.user_id','=','m.id')
+            ->leftJoin('member_level as ml', 'ml.id', '=', 'm.member_level')
+            ->leftJoin('master as ms', 'ms.user_id', '=', 'm.id')
             ->select($field)
             ->where($where)
-            ->where('m.status','>', 0)
+            ->where('m.status', '>', 0)
             ->first();
-         $info? $info->toArray() : [];
-
-
-         if(isset($info['avatar'])){
-             $info['avatar'] = $info['avatar']? get_image_url($info['avatar']) : '';
-         }
-         if(isset($info['master_type'])){
-             $info['master_type'] = intval($info['master_type']);
-         }
-        if(isset($info['master_status'])){
-            $info['master_status'] = intval($info['master_status']);
+        $info = $info ? $info->toArray() : [];
+        if (isset($info['avatar'])) {
+            $info['avatar'] = $info['avatar'] ? get_image_url($info['avatar']) : '';
         }
-        if(isset($info['master_name'])){
-            $info['master_name'] = empty($info['master_name'])? '' : $info['master_name'];
+
+        if($info){
+            if(array_key_exists('mtype', $info)){
+                $info['mtype'] = $info['mtype']? intval($info['mtype']) : 0;
+            }
+            if(array_key_exists('master_type', $info)){
+                $info['master_type'] = $info['master_type']? intval($info['master_type']) : 0;
+            }
+            if(array_key_exists('master_status', $info)){
+                $info['master_status'] = $info['master_status']? intval($info['master_status']) : 0;
+            }
+            if(array_key_exists('master_name', $info)){
+                $info['master_name'] = $info['master_name']? trim($info['master_status']) : '';
+            }
         }
-         return $info;
+
+        return $info;
     }
 }