diff --git a/service/app/admin/controller/OrderController.php b/service/app/admin/controller/OrderController.php index f412eddc..0c777a65 100644 --- a/service/app/admin/controller/OrderController.php +++ b/service/app/admin/controller/OrderController.php @@ -8,7 +8,7 @@ use app\model\Follows; use app\model\Orders; use app\model\Logs; use app\model\ThirdMobileLogs; -use app\server\AliCloudApiService; +use app\server\ThirdApiService; use app\server\Orders as ServerOrders; use stdClass; use support\Log; @@ -143,7 +143,7 @@ class OrderController extends base // 防止重复查询第三方接口 $mobileInfo = $localMobiles[$value['mobile']]; } else { - $mobileInfo = (new AliCloudApiService())->getMobileArea($value['mobile']); + $mobileInfo = (new ThirdApiService())->getMobileArea($value['mobile']); $localMobiles[$value['mobile']] = $mobileInfo; } } catch (\Exception $exception) { diff --git a/service/app/model/Orders.php b/service/app/model/Orders.php index dcfe6d4f..8090903e 100644 --- a/service/app/model/Orders.php +++ b/service/app/model/Orders.php @@ -30,7 +30,7 @@ class Orders extends base ]; const StatusName = ['待跟进', '跟进中', '已核销', '核销失败', '放弃跟单']; - const OSS = [1 => '美团', '7' => '美团(新国旅)', 2 => '快手', 3 => '抖音(甄选)', '5' => '抖音(新国旅)', '6' => '同程', 4 => '全平台']; + const OSS = [1 => '美团(甄选)', '7' => '美团(新国旅)', 2 => '快手', 3 => '抖音(甄选)', '5' => '抖音(新国旅)', '6' => '同程', 4 => '全平台']; const timeType = ['create_time' => '添加记录时间', 'update_time' => '修改记录时间', 'last_follow' => '最后跟进时间', 'next_follow' => '下次跟进时间', 'travel_date' => '出行时间', 'create_at' => '下单时间']; diff --git a/service/app/server/Douyin.php b/service/app/server/Douyin.php index c58e2a47..8d0e5065 100644 --- a/service/app/server/Douyin.php +++ b/service/app/server/Douyin.php @@ -516,10 +516,6 @@ class Douyin } $body = curl_exec($ch); curl_close($ch); - if ($this->os == 5) { - Log::info("抖音 os:{$this->os} \n\n"); - Log::info( "抖音 body:{$body} \n\n"); - } if (!in_array($method, ['GET', 'POST'])) { $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE); $header = substr($body, 0, $header_size); @@ -532,6 +528,13 @@ class Douyin } return null; } - return json_decode($body); + + $res = json_decode($body); + if (!isset($res['status_code']) || $res['status_code'] != 0) { + Log::info("抖音 os:{$this->os} \n\n"); + Log::info( "抖音 body:{$body} \n\n"); + (new ThirdApiService())->weComNotice($this->os); + } + return $res; } } \ No newline at end of file diff --git a/service/app/server/Meituan.php b/service/app/server/Meituan.php index 280e194f..080c7db4 100644 --- a/service/app/server/Meituan.php +++ b/service/app/server/Meituan.php @@ -150,12 +150,14 @@ class Meituan { } $body = curl_exec($ch); - if ($this->os == 7) { + curl_close($ch); + $res = json_decode($body); + if (!isset($res['code']) || $res['code'] != 0) { Log::info('os:' . $this->os); Log::info('http:' . $http); Log::info('body:' . $body); + (new ThirdApiService())->weComNotice($this->os); } - curl_close($ch); - return json_decode($body); + return $res; } } \ No newline at end of file diff --git a/service/app/server/AliCloudApiService.php b/service/app/server/ThirdApiService.php similarity index 78% rename from service/app/server/AliCloudApiService.php rename to service/app/server/ThirdApiService.php index c6025ce9..ca5403e8 100644 --- a/service/app/server/AliCloudApiService.php +++ b/service/app/server/ThirdApiService.php @@ -1,13 +1,16 @@ notice, Orders::OSS[$os] ?? ''); + $bodys = [ + 'msgtype' => 'text', + 'text' => [ + 'content' => $message + ] + ]; + + return $this->curlRequest($url, $method, [], $bodys); + } } \ No newline at end of file diff --git a/service/app/server/Tongcheng.php b/service/app/server/Tongcheng.php index 650272ca..1318022f 100644 --- a/service/app/server/Tongcheng.php +++ b/service/app/server/Tongcheng.php @@ -106,7 +106,7 @@ class Tongcheng { if (empty($list) || $list->code != 1000) { $this->_getRetriesLock(); $list = $this->_curl("/merchant/api/market-live/wxVideoV2/supplierOrderByPage", $params, 'POST'); - if (empty($list) || $list->status_code != 0) { + if (empty($list) || $list->code != 1000) { Log::error('===查询时间:' . $start . '--' . $end . '====certificate_list: ' . json_encode($list)); throw new Exception("同程拉单失败,Err:" . json_encode($list)); } @@ -268,6 +268,12 @@ class Tongcheng { } return null; } - return json_decode($body); + + $res = json_decode($body); + if (!isset($res['code']) || $res['code'] != 1000) { + Log::info( "同城 body:{$body} \n\n"); + (new ThirdApiService())->weComNotice($this->os); + } + return $res; } } \ No newline at end of file