隐私号码优化

application/model/AliYunPhone.php

@@ -41,7 +41,7 @@ class AliYunPhone extends BaseModel
         $m_bind = new BindingPhone();
         $id_arr = $m_bind->getBindingPhoneList('b.id', $where_bind);
 
-        foreach ($id_arr as $k=>$v) {
+        foreach ($id_arr['data'] as $k=>$v) {
             $id[$k] = $v['id'];//去除phone_a已经绑定的号码
         }
 
@@ -59,6 +59,65 @@ class AliYunPhone extends BaseModel
         return $result;
     }
 
+    /**
+     * 获取未绑定的手机号码
+     *
+     * @param $phone_a
+     * @param $phone_b
+     * @param int $type
+     * @param array $phone_x
+     * @return mixed
+     */
+    public function getAliYunPhoneAll($phone_a, $phone_b, $type = 1, $phone_x = [])
+    {
+        $result['data'] = [];
+
+        $m_bind = new BindingPhone();
+
+        //尝试多次绑定，去除已经绑定失败的号码
+        if (!empty($phone_x)) {
+            $where_bind_a['b.phone_x'] = [ 'NOT IN', $phone_x];
+            $where_bind_b['b.phone_x'] = [ 'NOT IN', $phone_x];
+        }
+
+        //找到与phone_a绑定的隐私号码
+        $where_bind_a['a.phone_a'] = $phone_a;
+        $where_bind_a['a.status']  = 1;
+        $where_bind_a['b.type']    = $type;
+        $id_arr_a                  = $m_bind->getBindingPhoneList('b.id', $where_bind_a);
+
+        //找到phone_b绑定的隐私号码
+        $where_bind_b['a.phone_a'] = $phone_b;
+        $where_bind_b['a.status']  = 1;
+        $where_bind_b['b.type']    = $type;
+        $id_arr_b                  = $m_bind->getBindingPhoneList('b.id', $where_bind_a);
+
+        $id_merge = array_merge($id_arr_a['data'], $id_arr_b['data']);
+
+        foreach ($id_merge as $k => $v) {
+            $id[$k] = $v['id'];//去除phone_a已经绑定的号码
+        }
+
+        $id                    = empty($id) ? 0 : $id;
+        $where_phone['status'] = 0;
+        $where_phone['type']   = $type;
+
+        try {
+            if (empty($id)) {
+                $result['data'] = $this->field('id,phone_x,area')->where($where_phone)->find();
+            } else {
+                $where_phone['id'] = [ 'NOT IN', $id ];   //排除已经绑定的号码
+                $result['data']    = $this->field('id,phone_x,area')->where($where_phone)->find();
+            }
+            $result['status'] = 'successful';
+        } catch (\Exception $e) {
+            $result['status'] = 'fail';
+            $result['msg']    = $e->getMessage();
+        }
+
+        return $result;
+    }
+
     /**
      * 绑定手机号列表
      *

application/model/BindingPhone.php

@@ -108,19 +108,26 @@ class BindingPhone extends BaseModel
     }
 
     /**
+     * 获取绑定信息
+     *
      * @param $field
      * @param $where
-     * @return false|\PDOStatement|string|\think\Collection
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
+     * @return mixed
      */
     public function getBindingPhoneList($field, $where)
     {
-        return $this->field($field)->alias('a')
-            ->join('aliYun_phone b', 'a.aliYun_phone_id = b.id', 'left')
-            ->where($where)
-            ->select();
+        $data['data'] = [];
+        try {
+            $data['data'] = $this->field($field)->alias('a')
+                ->join('aliYun_phone b', 'a.aliYun_phone_id = b.id', 'left')
+                ->where($where)
+                ->select();
+            $data['status'] = 'successful';
+        } catch (\Exception $e) {
+            $data['status'] = 'fail';
+            $data['msg']    = $e->getMessage();
+        }
+        return $data;
     }
 
     /**

application/task/controller/PrivacyNumber.php

@@ -149,7 +149,7 @@ class PrivacyNumber
         $binding_phone_id = [];
         $phone_id         = [];
         $bind             = new BindingPhone();
-        foreach ($bind_data as $k => $v) {
+        foreach ($bind_data['data'] as $k => $v) {
             //解除绑定
             if ($v['type'] == 1 && !empty($v['subsId'])) {
                 //释放阿里云隐私号码
@@ -284,7 +284,7 @@ class PrivacyNumber
         $where['a.expiry_date'] = [ '<', date('Y-m-d H:i:s') ];
         $select_data            = $m_bind->getBindingPhoneList('a.id,a.aliYun_phone_id,b.phone_x,a.subsId,a.expiry_date', $where);
 
-        foreach ($select_data as $k => $v) {
+        foreach ($select_data['data'] as $k => $v) {
             $query_status = PlsDemo::querySubscriptionDetail($v['subsId'], $v['phone_x']);
             if (isset($query_status->Code) && ($query_status->Code != 'OK')) {
                 $m_bind->unBindTable($v['id'], $v['aliYun_phone_id']);