推送和用户缓存更新

application/api/controller/Member.php

@@ -3,6 +3,7 @@
 namespace app\api\controller;
 
 use app\api_broker\service\PushMessageService;
+use app\api_broker\service\RedisCacheService;
 use app\index\service\UserService;
 use app\model\AAgents;
 use think\Request;
@@ -458,6 +459,8 @@ class Member extends Basic
                     $image = \think\Image::open($static_path);
                     $image->thumb(500, 500)->save($static_path);   //生成缩略图
 
+                    $redis_service = new RedisCacheService();
+                    $redis_service->userCache($this->userId);
                     $data['status'] = 200;
                     $data['msg']    = '上传成功';
                     $data['data']   = ['file_name' => IMAGES_URL . $img_path];

application/api/controller/Register.php

@@ -5,6 +5,7 @@ namespace app\api\controller;
 use app\api\extend\Basic;
 use app\api\service\RegisterService;
 use app\api\untils\MessageUntils;
+use app\api_broker\service\RedisCacheService;
 use app\extra\RedisExt;
 use app\model\Users;
 use think\Request;
@@ -119,6 +120,8 @@ class Register extends Basic
 
         $is_up = $this->service_->unbundling($params["buyer_id"], $params["user_id"]);
         if ($is_up > 0) {
+            $redis_service = new RedisCacheService();
+            $redis_service->userCache($params["user_id"]);
             return $this->response("200", "解绑成功");
         } else {
             return $this->response("101", "解绑失败");

application/api/service/PushClientService.php

@@ -129,6 +129,7 @@ class PushClientService
             if (empty($push_id)) {
                 $result = false;
             } else {
+                $house_id = empty($house_id) ? '':$house_id;
                 $result = $push->public_push_message_for_one($id, $push_id['push_id'], $title, $content, $type, $user_id,  $house_id, $order_id, $name);
             }
         }

application/api/service/RegisterService.php

@@ -4,6 +4,7 @@ namespace app\api\service;
 
 use app\api\untils\JwtUntils;
 use app\api_broker\service\PushMessageService;
+use app\api_broker\service\RedisCacheService;
 use app\api_broker\service\UserExpiredTimeService;
 use app\model\Users;
 use app\model\UWxInfo;
@@ -148,6 +149,9 @@ class RegisterService
         $data["user_phone"] = $phone;
         $data["user_pic"]   = !empty($user_info[0]["user_pic"]) ? HEADERIMGURL . $user_info[0]["user_pic"] : $other_pic;
         $data["AuthToken"]  = $AuthToken;
+
+        $redis_service = new RedisCacheService();
+        $redis_service->userCache($id);
         return [ "code" => 200, "data" => $data ];
 
     }

application/api_broker/service/PushMessageService.php

@@ -284,6 +284,7 @@ class PushMessageService
         if (!empty($device_id_array)) {
             foreach ($device_id_array as $k => $v) {
                 if (!empty($v['push_id'])) {
+                    $house_id = empty($house_id) ? '':$house_id;
                     $result[] = $this->push->public_push_message_for_one($id, $v['push_id'], $title, $content, $type, $user_id,  $house_id, $order_id, $title);
                 }
             }

application/api_broker/service/RedisCacheService.php

@@ -144,7 +144,7 @@ class RedisCacheService
         $m_user = new Users();
         $field  = 'id,user_nick,user_name,user_phone,user_pic,other_pic,sex,protect_time,site_ids,agent_id,referrer_id,referrer_source';
         $field .= ',is_open,industry_type,price_demand,area_demand,status,source,user_status,registration_time,vip,create_time,first_login_time';
-        $field .= ',source_intro';
+        $field .= ',source_intro,bind_id';
         $user_data = $m_user->findByOne($field, ['id'=>$user_id]);
         if (!empty($user_data)) {
             if ($user_data['referrer_source'] == 10 && $user_data['referrer_id'] > 0) {

application/index/controller/Member.php

@@ -5,18 +5,14 @@ use app\api_broker\service\CallPhoneService;
 use app\api_broker\service\ClientService;
 use app\api_broker\service\RedisCacheService;
 use app\api_broker\service\VipService;
-use app\extra\RedisExt;
 use app\index\extend\Basic;
 use app\index\service\BrokerService;
 use app\index\service\UserService;
 use app\model\AAgents;
-use app\model\ACollectUser;
 use app\model\GOperatingRecords;
 use app\model\UPhoneFollowUp;
 use app\model\UPhoneFollowUpTemporary;
 use app\model\Users;
-use app\task\controller\FollowUpTask;
-use think\Log;
 use think\Request;
 use think\session;
 
@@ -539,7 +535,7 @@ class Member extends Basic{
         $user_data_arr = [];
         $records = new GOperatingRecords();
         $agent   = new AAgents();
-
+        $redis_service = new RedisCacheService();
         foreach ($user_data as $k=>$v) {
             $user_data_arr[$k]['id'] = $v['id'];
             $user_data_arr[$k]['agent_id'] = $this->params['agents_id'];
@@ -547,6 +543,7 @@ class Member extends Basic{
             $agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
             $remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone'];
             $records->record($this->userId, 3, $remark, 0, $v['id']);
+            $redis_service->userCache($v['id']);
         }
 
         $total = $user->updateUserAll($user_data_arr);

application/index/service/BrokerService.php

@@ -395,6 +395,7 @@ class BrokerService
     private function transferUserHouse(Int $id,int $change_old_id,int $operation_id,array $agent_data = [])
     {
         $m_user = new Users();
+        $redis_service = new RedisCacheService();
         $update_user = $update_house = [];
         $user_id_arr = $m_user->getUserByWhereColumn(['agent_id' => $change_old_id], 'id');
         $referrer_id_arr = $m_user->getUserByWhereColumn(['referrer_id' => $change_old_id, 'referrer_source'=>20], 'id');
@@ -402,6 +403,7 @@ class BrokerService
         foreach ($user_id_arr as $k => $v) {
             $update_user[$k]['id'] = $v;
             $update_user[$k]['agent_id'] = $id;
+            $redis_service->userCache($v);
         }
 
         foreach ($referrer_id_arr as $k2=>$v2) {

application/index/service/UserService.php

@@ -453,8 +453,8 @@ class UserService
         $params_['protect_time'] = $future_time;
         $res = $this->user->updateUsers($user_id,$params_);//int(1)
 
-        //$redis = RedisExt::getRedis();
-        //$redis->set('set_user_save_time_'. $user_id, 1, 24 * 3600);
+        $redis_service = new RedisCacheService();
+        $redis_service->userCache($user_id);
 
         if($res == 1){
             return true;
@@ -494,6 +494,8 @@ class UserService
         //保存数据
         $params_['site_ids'] = $site_ids;
         $this->user->updateUsers($user_id, $params_);//int(1)
+        $redis_service = new RedisCacheService();
+        $redis_service->userCache($user_id);
         return true;
     }
 
@@ -651,6 +653,8 @@ class UserService
         $params_['bind_id'] = $params_bind_id;
         $res = $this->user->updateUsers($params_user_id,$params_);
         if($res ==1){
+            $redis_service = new RedisCacheService();
+            $redis_service->userCache($user_id);
             return true;
         }else{
             return '绑定失败或已绑定过';
@@ -695,6 +699,9 @@ class UserService
             }
             $this->user->updateUsers($id,$params_);
         }
+        $redis_service = new RedisCacheService();
+        $redis_service->userCache($user_id);
+        $redis_service->userCache($now_user_id);
         return 0;
     }