Merge branch 'test'

application/api_broker/service/CallPhoneService.php

@@ -122,21 +122,22 @@ class CallPhoneService
                 $result['phone'] = $phone_b;
                 return $result;
             }
-            $call_key = 'call_'.$agent_id.'_'.$this->phone_a.'_'.$this->phone_b;
+            $call_key = 'call_'.$agent_id.'_'.$this->phone_a.'_'.$this->phone_b.'_'.$this->is_privacy;
             $phone_x = $this->redis->get($call_key);
             $bind = new BindingPhone();
 
-            if (empty($phone_x)) {
+            if (empty($phone_x) && $this->is_privacy ==  1) {
                 $where['a.status'] = 1;
                 $where['a.phone_a'] = $phone_a;
                 $where['a.phone_b'] = $phone_b;
                 $where['a.type'] = $this->is_privacy;
-
                 $phone_x_arr = $bind->getPhoneX('b.phone_x,a.subsId', $where);   //已经绑定的返回隐私号码
-                //兼容
-                $check_data = PlsDemo::querySubscriptionDetail($phone_x_arr['subsId'], $phone_x_arr['phone_x']);
-                if ($check_data->Code == 'OK') {
-                    $phone_x = $phone_x_arr['phone_x'];
+                if (!empty($phone_x_arr['subsId']) && $phone_x_arr['phone_x']) {
+                    //兼容
+                    $check_data = PlsDemo::querySubscriptionDetail($phone_x_arr['subsId'], $phone_x_arr['phone_x']);
+                    if ($check_data->Code == 'OK' && $check_data->SecretBindDetailDTO->Status == 1) {
+                        $phone_x = $phone_x_arr['phone_x'];
+                    }
                 }
             }
 
@@ -172,7 +173,7 @@ class CallPhoneService
                     $result['phone'] = $call_phone['phone'];
                     $result['msg'] = $call_phone['msg'];
                     $type = 'AliYunBindAxb';
-                    $this->redis->set($call_key, $call_phone['phone'], strtotime($this->expiry_date));
+                    $this->redis->set($call_key, $call_phone['phone'], strtotime($this->expiry_date) - time());
                     $bind->recordBindPhone($call_phone['phone'], $phone_a, $phone_b, $record, $this->expiry_date, $this->subs_id, $this->request_id, $this->mapping_id, $this->is_privacy, $this->release);
                 } else {
                     $result['msg'] = $call_phone['msg'];
@@ -185,7 +186,7 @@ class CallPhoneService
                     $result['phone'] = $call_phone['phone'];
                     $result['msg'] = $call_phone['msg'];
                     $type = 'YunTongXunBindAxb';
-                    $this->redis->set($call_key, $call_phone['phone'], strtotime($this->expiry_date));
+                    $this->redis->set($call_key, $call_phone['phone'], strtotime($this->expiry_date) - time());
                     $bind->recordBindPhone($call_phone['phone'], $phone_a, $phone_b, $record, $this->expiry_date, $this->subs_id, $this->request_id, $this->mapping_id, $this->is_privacy, $this->release);
                 } else {
                     $result['msg'] = $call_phone['msg'];
@@ -349,7 +350,7 @@ class CallPhoneService
         }
 
         $phone = new BindingPhone();
-        $call_key = 'call_'.$agent_id.'_'.$this->phone_a.'_'.$this->phone_b;
+        $call_key = 'call_'.$agent_id.'_'.$this->phone_a.'_'.$this->phone_b.'_'.$this->is_privacy;
         try {
             if ($this->is_privacy == 1) {
                 /*阿里云*/

application/index/controller/Store.php

@@ -49,7 +49,7 @@ class Store extends Basic
 
             //店长姓名
             if (!empty($this->params['agents_name'])) {
-                $where['b.name'] = ['LIKE',$this->params['agents_name'].'%'];
+                $where['b.name'] = ['LIKE','%'.$this->params['agents_name'].'%'];
                 $join = 1;//连表查询店长名
             }