1

application/api_broker/controller/LookShop.php

@@ -194,7 +194,7 @@ class LookShop extends Basic
             return $this->response("101", $checkResult);
         }
         $pageNo        = empty($params['pageNo']) ? 1 : $params['pageNo'];
-        $pageSize      = empty($params['pageSize']) ? 15 : $params['pageSize'];
+        $pageSize      = empty($params['pageSize']) ? 10 : $params['pageSize'];
         $s_look_Shop = new LookShopService();
         $result = $s_look_Shop->getShopUserVisitLog($params,$pageNo, $pageSize);
         return $this->response("200", "success", $result);

application/api_broker/service/LookShopService.php

@@ -8,6 +8,7 @@ use app\model\GHousesToAgents;
 use app\model\SystemConfig;
 use app\model\TLookShopUser;
 use app\model\Users;
+use app\model\UWxInfo;
 use RedisException;
 use think\Exception;
 use think\Log;
@@ -237,34 +238,37 @@ class LookShopService
     }
 
 
-
     /**
      * 客户浏览记录
      * @param $conditions
      * @param $pageNo
      * @param $pageSize
-     * @return bool|false|\PDOStatement|string|\think\Collection
+     * @return array|false|\PDOStatement|string|\think\Collection
      */
     public function getShopUserVisitLog($conditions,$pageNo, $pageSize)
     {
         $m_look_shop = new TLookShopUser();
-        $field = 'a.type,a.user_id,a.create_time,a.source,b.buyer_nick,b.buyer_img,c.id';
+        $field = 'a.id as t_look_shop_user_id,a.type,a.user_id,a.create_time,a.source';
         $conditions_['a.house_id'] = $conditions['house_id'];
         $list = $m_look_shop->getLookShopList($conditions_, $field, $pageNo, $pageSize);
         if (!$list) {
             return [];
         }
         $u_user = new Users();
+        $m_wxinfo = new UWxInfo();
         foreach ($list as $k => $v) {
-            if($v['source'] == 0){
+            if($v['source'] == 0){//查看类型  0：user_id为u_user表id   1：user_id为wx_info表id
                 $fields = "b.buyer_nick,b.buyer_img";
                 $result = $u_user->getUserInfoById(['user_id'=>$v['user_id']], $fields);
-                $list[$k]['buyer_nick'] = $result['buyer_nick'];
-                $list[$k]['buyer_img'] = $result['buyer_img'];
+                $list[$k]['buyer_nick'] = $result[0]['buyer_nick'];
+                $list[$k]['buyer_img'] = $result[0]['buyer_img'];
             }else{
-                $list[$k]['user_id'] = $v['id'];
+                $fields = "a.buyer_nick,a.buyer_img,b.id";
+                $result = $m_wxinfo->getWxInfoById(['wx_info_id'=>$v['user_id']], $fields);
+                $list[$k]['buyer_nick'] = $result[0]['buyer_nick'];
+                $list[$k]['buyer_img'] = $result[0]['buyer_img'];
+                $list[$k]['user_id'] = $result[0]['id'];
             }
-            unset($list[$k]['id']);
         }
         return $list;
     }

application/model/TLookShopUser.php

@@ -68,24 +68,25 @@ class TLookShopUser extends Model
 
     public function getLookShopList($condition, $field, $pageNo, $pageSize)
     {
-        return $this->db_
+        $data =  $this->db_
             ->field($field)
             ->alias("a")
-            ->join("u_wx_info b","a.user_id=b.id","left")
-            ->join("u_users c", "c.buyer_id=b.id", "left")
+            // ->join("u_wx_info b","a.user_id=b.id","left")
+            // ->join("u_users c", "c.buyer_id=b.id", "left")
             ->where($condition)
             ->page($pageNo)
             ->limit($pageSize)
             ->order("a.id desc")
             ->select();
+        return $data;
     }
     public function getLookShopListCount($condition, $field)
     {
         return $this->db_
             ->field($field)
             ->alias("a")
-            ->join("u_wx_info b","a.user_id=b.id","left")
-            ->join("u_users c", "c.buyer_id=b.id", "left")
+            // ->join("u_wx_info b","a.user_id=b.id","left")
+            // ->join("u_users c", "c.buyer_id=b.id", "left")
             ->where($condition)
             ->count();
     }

application/model/UWxInfo.php

@@ -119,4 +119,21 @@ class UWxInfo extends Model
         $arr["update_time"] = date("Y-m-d H:i:s", time());
         return $arr;
     }
+
+
+    public function getWxInfoById($param, $fields)
+    {
+        $where_ = [];
+
+        if (isset($param["wx_info_id"])) {
+            $where_["a.id"] = $param["wx_info_id"];
+        }
+        $data = $this
+            ->field($fields)
+            ->alias("a")
+            ->join("u_users b", "a.id = b.buyer_id", "left")
+            ->where($where_)
+            ->select();
+        return $data;
+    }
 }

application/model/Users.php

@@ -941,6 +941,7 @@ class Users extends Model
         if (isset($param["user_id"])) {
             $where_["a.id"] = $param["user_id"];
         }
+
         $data = $this
             ->field($fields)
             ->alias("a")