This commit is contained in:
commit
1def7c7d0d
|
@ -26,8 +26,8 @@ class AdminController extends base
|
||||||
}
|
}
|
||||||
|
|
||||||
if($typeDesc = $request->get('type_desc')) {
|
if($typeDesc = $request->get('type_desc')) {
|
||||||
$routeType = self::ROUTE_LISTS[mb_substr($typeDesc, 0, 2)] ?? 10;
|
//$routeType = self::ROUTE_LISTS[mb_substr($typeDesc, 0, 2)] ?? 10;
|
||||||
$query->where('route_type', $routeType);
|
//$query->where('route_type', $routeType);
|
||||||
}
|
}
|
||||||
|
|
||||||
$list = $query->paginate($request->get('limit',10));
|
$list = $query->paginate($request->get('limit',10));
|
||||||
|
|
|
@ -65,7 +65,15 @@ class SpiderDy extends Command
|
||||||
|
|
||||||
protected function poolUser($status = 0, $categoryDesc = '')
|
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;
|
$status .= $routeType;
|
||||||
if (empty($this->_redis_pool[$status])) {
|
if (empty($this->_redis_pool[$status])) {
|
||||||
$this->_redis_pool[$status] = Redis::hGetAll('CRM:Pool:' . $status);
|
$this->_redis_pool[$status] = Redis::hGetAll('CRM:Pool:' . $status);
|
||||||
|
|
|
@ -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))
|
// ((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)
|
return (in_array($order->os, [1, 7]) && $order->order_status == 3)
|
||||||
|| ($order->os == 2 && $order->order_status == 4)
|
|| ($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;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue