diff --git a/service/app/command/SpiderDy.php b/service/app/command/SpiderDy.php index f832a4e5..2a625e7e 100644 --- a/service/app/command/SpiderDy.php +++ b/service/app/command/SpiderDy.php @@ -65,7 +65,15 @@ class SpiderDy extends Command protected function poolUser($status = 0, $categoryDesc = '') { - $routeType = AdminController::ROUTE_LISTS[mb_substr($categoryDesc, 0, 2)] ?? 10; + $routeType = 10; + // 抖音境内外类型判断 + $abroadKeyWords = ['曼谷', '港', '澳', '泰国', '普吉岛', '境外']; + foreach ($abroadKeyWords as $kw) { + if (mb_strpos($categoryDesc, $kw) !== false) { + $routeType = 20; + break; + } + } $status .= $routeType; if (empty($this->_redis_pool[$status])) { $this->_redis_pool[$status] = Redis::hGetAll('CRM:Pool:' . $status); diff --git a/service/app/server/Orders.php b/service/app/server/Orders.php index 89648877..9db6ac0c 100644 --- a/service/app/server/Orders.php +++ b/service/app/server/Orders.php @@ -17,7 +17,8 @@ class Orders { // ((os=1 and order_status=3) or (os=2 and order_status=4) or (os=3 and order_status=1)) return (in_array($order->os, [1, 7]) && $order->order_status == 3) || ($order->os == 2 && $order->order_status == 4) - || (in_array($order->os, [3, 5]) && in_array($order->order_status, [1, 5])); + || (in_array($order->os, [3, 5]) && in_array($order->order_status, [1, 5])) + || (in_array($order->os, [6]) && in_array($order->order_status, [200])); } /** @@ -117,6 +118,14 @@ class Orders { } } + break; + case 6: + $tc = new Tongcheng($order->os); + $it = $tc->get(1, null, null, $order->sn); + + if ($it) { + $got = $it[0]; + } break; }