Merge branch '0703-v3.3.4' of https://gitee.com/zwyjjc/tl_estate into 0703-v3.3.4

application/index/controller/ImageDepot.php

@@ -4,6 +4,7 @@ namespace app\index\controller;
 
 use app\index\extend\Basic;
 use app\index\service\UserAgentService;
+use app\index\service\UserSiteService;
 use app\model\GImageDepot;
 
 /**
@@ -176,8 +177,11 @@ class ImageDepot extends Basic
         // $res =  $s->getPositionDistance('31.170841,121.463858','31.17265,121.464914');
         // dump($res);
 
-        $s_user_agent = new UserAgentService();
-        $res = $s_user_agent->moveHouse();
+        // $s_user_agent = new UserAgentService();
+        // $res = $s_user_agent->moveHouse();
+
+        $s = new UserSiteService();
+        $res = $s->moveUserSite();
 
         // dump($res);
     }

application/index/service/UserSiteService.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: fuju
+ * Date: 2018/8/27
+ * Time: 12:43
+ */
+
+namespace app\index\service;
+
+
+use app\model\Users;
+use app\model\UserSiteModel;
+
+class UserSiteService
+{
+    protected $m_user;
+    protected $m_user_site;
+
+    public function __construct()
+    {
+        $this->m_user = new Users();
+        $this->m_user_site = new UserSiteModel();
+    }
+
+
+    /**
+     * 新增客方
+     * @param $agent_id
+     * @param $user_id
+     * @param $site_id
+     * @return bool
+     */
+    // public function addUserAgent($agent_id,$user_id,$site_id)
+    // {
+    //     $user_agent_info = $this->findUserAgent($site_id,$agent_id,$user_id);
+    //     if($user_agent_info){
+    //         return false;
+    //     }
+    //     $params['user_id']=$user_id;
+    //     $params['site_id']=$site_id;
+    //     $params['agent_id']=$agent_id;
+    //     $add_res = $this->m_user_agent->saveUserAgent($params);
+    //     return true;
+    // }
+    //
+    // /**
+    //  * 查询客方
+    //  * @param $agent_id
+    //  * @param $user_id
+    //  * @param $site_id
+    //  * @return array|bool|false|\PDOStatement|string|\think\Model
+    //  */
+    // public function findUserAgent($site_id,$agent_id = 0,$user_id = 0)
+    // {
+    //     $params['a.site_id'] = $site_id;
+    //     if($user_id > 0){
+    //         $params['a.user_id'] = $user_id;
+    //     }
+    //     if($agent_id > 0){
+    //         $params['a.agent_id'] = $agent_id;
+    //     }
+    //     $field = 'a.id,a.user_id,a.site_id,a.agent_id,c.name,c.phone';
+    //     $user_agent_info = $this->m_user_agent->getUserAgent($field,$params);
+    //     if(!$user_agent_info){
+    //         return false;
+    //     }
+    //     return $user_agent_info;
+    // }
+    //
+    // /**
+    //  * 查询客方列表
+    //  * @param $user_id
+    //  * @return bool|false|\PDOStatement|string|\think\Collection
+    //  */
+    // public function selectUserAgent($user_id)
+    // {
+    //     $params['user_id'] = $user_id;
+    //
+    //     $field = 'a.site_id,a.agent_id,d.name as site_name,c.name as agent_name,c.phone as agent_phone';
+    //     $user_agent_info = $this->m_user_agent->selectUserAgent($field,$params);
+    //     if(!$user_agent_info){
+    //         return false;
+    //     }
+    //     return $user_agent_info;
+    // }
+    //
+    // /**
+    //  * 修改客方
+    //  * @param $agent_id
+    //  * @param $user_id
+    //  * @param $site_id
+    //  */
+    // public function changeUserAgent($agent_id,$user_id,$site_id)
+    // {
+    //     $where['user_id']=$user_id;
+    //     $where['site_id']=$site_id;
+    //     $params['agent_id']=$agent_id;
+    //     $change_res = $this->m_user_agent->updateUserAgent($where,$params);
+    // }
+
+
+
+    /**
+     * 处理老数据
+     */
+    public function moveUserSite(){
+        $limit = 1000;
+
+        $user_count = $this->moveUserSiteCount();
+        $total_page = intval($user_count / $limit) + (($user_count % $limit == 0) ? 0 : 1);
+
+        for ($page = 1; $page <= $total_page; $page++) {
+            $res =  $this->moveUserSiteSaveData($page,$limit);
+            big_log($res);
+        }
+        return '';
+    }
+
+    /**
+     * 保存数据
+     * @param int $page
+     * @param int $limit
+     * @return int|string
+     */
+    public function moveUserSiteSaveData($page = 1,$limit = 100){
+        $field = "id as user_id,site_ids as site_id";
+        $params[] = ['EXP', 'site_ids IS NOT NULL '];
+        $list = $this->m_user->moveUserSite($field, $params, $page, $limit, "id asc");
+
+        foreach ($list as $k => $v) {
+            $site_ids = explode(',',$v['site_id']);
+            if(count($site_ids)>1){
+                foreach ($site_ids as $k1 => $v1) {
+                    $a['user_id']= $v['user_id'];
+                    $a['site_id']= $v1;
+                    $a['create_time'] = date("Y-m-d H:i:s", time());
+                    $a['update_time'] = date("Y-m-d H:i:s", time());
+                    unset($list[$k]);
+                    dump($a);
+                    $list[] = $a;
+                }
+                // dump($site_ids);exit;
+            }else{
+                $list[$k]['create_time'] = date("Y-m-d H:i:s", time());
+                $list[$k]['update_time'] = date("Y-m-d H:i:s", time());
+            }
+
+        }
+        // dump($list);exit;
+        $user_insert = $this->m_user_site->moveHouseInsertAll($list);
+        return $user_insert;
+    }
+
+    /*
+     * 符合要求的客户数量
+     */
+    public function moveUserSiteCount(){
+        $params[] = ['EXP', 'site_ids IS NOT NULL '];
+        $user_count = $this->m_user->moveUserSiteCount($params);
+        return $user_count;
+    }
+
+
+}
\ No newline at end of file

application/model/UserSiteModel.php

@@ -30,6 +30,13 @@ class UserSiteModel extends Model
         return $this->db_ ->insert($data);
     }
 
+    public function moveHouseInsertAll($data)
+    {
+        $result = Db::table($this->table)
+            ->insertAll($data);
+        return $result;
+    }
+
     // /**
     //  * 查询数据
     //  */

application/model/Users.php

@@ -499,15 +499,19 @@ class Users extends Model
     {
         $where_ = [];
         if (isset($params["agent_id"])) {
-            $where_["agent_id"] = $params["agent_id"];
+            $where_["b.agent_id"] = $params["agent_id"];
         }
+
         if (isset($params["create_time"])) {
-            $where_["create_time"] = $params["create_time"];
+            $start_time = $params["create_time"][1][0];
+            $end_time =$params["create_time"][1][1];
+            $where_[] = ['EXP', "b.create_time BETWEEN '{$start_time}' AND '{$end_time}' OR b.update_time BETWEEN '{$start_time}' AND '{$end_time}' "];
         }
         return Db::table($this->table)
+            ->alias("a")
+            ->join("u_user_agent b", "b.user_id=a.id", "left")
             ->where($where_)
             ->count();
-
     }
 
     /**
@@ -1112,6 +1116,15 @@ class Users extends Model
             ->select();
     }
 
+    /**
+     * 客户客方老数据处理
+     * @param $field
+     * @param $params
+     * @param $page
+     * @param $limit
+     * @param $order
+     * @return false|\PDOStatement|string|\think\Collection
+     */
     public function moveHouse($field, $params,$page, $limit, $order)
     {
         $result = Db::table($this->table)
@@ -1126,6 +1139,32 @@ class Users extends Model
         return $result;
     }
 
+    /**
+     * 客户站点老数据处理
+     * @param $field
+     * @param $params
+     * @param $page
+     * @param $limit
+     * @param $order
+     * @return false|\PDOStatement|string|\think\Collection
+     */
+    public function moveUserSite($field, $params,$page, $limit, $order)
+    {
+        $result = Db::table($this->table)
+            ->field($field)
+            ->where($params)
+            ->order($order)
+            ->page($page)
+            ->limit($limit)
+            ->select();
+        return $result;
+    }
+
+    /**
+     * 客户客方老数据处理
+     * @param $params
+     * @return int|string
+     */
     public function moveHouseCount($params)
     {
         $result = Db::table($this->table)
@@ -1136,11 +1175,20 @@ class Users extends Model
         return $result;
     }
 
-    public function moveHouseInsertAll($data)
+    /**
+     * 客户站点老数据处理
+     * @param $params
+     * @return int|string
+     */
+    public function moveUserSiteCount($params)
     {
+
         $result = Db::table($this->table)
-            ->insertAll($data);
+            ->where($params)
+            ->count();
+
         return $result;
     }
+
 }