service/app/admin/controller/OrderController.php

@@ -28,8 +28,6 @@ class OrderController extends base
         $where = [];
         if(!$request->admin->is_super) {
             $where = [['admin_id','=', $request->admin->id]];
-        } else {
-            $where = [['admin_id', '>', 0]];
         }
 
         if($sn) {
@@ -169,8 +167,6 @@ class OrderController extends base
                 $statss = Orders::DouyinStatus;
             }elseif($key ==6) {
                 $statss = Orders::TongchengStatus;
-            }elseif($key ==6) {
-                $statss = Orders::OrderStatus;
             }
 
             $_ch = [];

service/app/command/SpiderMt.php

@@ -334,7 +334,7 @@ class SpiderMt extends Command
     {
 
         foreach (Orders::OSS as $k => $os) {
-            $pages = 10;
+            $pages = 6;
             $page = 1;
 
             while (true) {
@@ -343,11 +343,15 @@ class SpiderMt extends Command
 
                 switch ($k) {
                     case 1:
-                    case 7:
                         try {
-                            $mei = new Meituan($k);
+                            $mei = new Meituan();
                             $list = $mei->get($page, $start, $end);
                             // $pages = $mei->totalPage;
+
+                            if ($mei->totalPage === 1)  {
+                                $pages = 1;
+                            }
+
                         } catch (\Exception $e) {
                             Log::error(dirname(__FILE__) . __LINE__ . $e);
                         }
@@ -377,7 +381,7 @@ class SpiderMt extends Command
                         # code...
                         break;
                 }
-echo 'order:' . json_encode($list);
+
                 foreach ($list as $order) {
 
                     $item = Orders::where('os', $order->os)->where('sn', $order->sn)->find();
@@ -404,7 +408,9 @@ echo 'order:' . json_encode($list);
                         $order->give_time = time();
 
                         //判断是否需要发短信
-                        if ((in_array($order->os, [1, 7]) && array_key_exists($order->order_status, [1 => 1, 3 => 3]))) {
+                        if (($order->os == 1 && array_key_exists($order->order_status, [1 => 1, 3 => 3])) ||
+                            ($order->os == 2 && array_key_exists($order->order_status, [2 => 2, 3 => 3, 4 => 4])) ||
+                            ($order->os == 3 && $order->order_status == 1)) {
                             if ($admin_id > 0) {
                                 $this->sms($admin_id, $order);
                             }
@@ -432,10 +438,6 @@ echo 'order:' . json_encode($list);
                     }
                 }
 
-                // 数据小于50, 结束
-                if (count($list) < 50) {
-                    break;
-                }
                 $page++;
             }
         }
@@ -462,8 +464,7 @@ echo 'order:' . json_encode($list);
         $it = null;
         switch ($item->os) {
             case 1:
-            case 7:
+                $m = new Meituan();
-                $m = new Meituan($item->os);
                 $it = $m->get(1, null, null, $item->sn);
                 break;
 /*            case 2:

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 => '美团', 2 => '快手', 3 => '抖音(甄选)', '5' => '抖音（新国旅）', '6' => '同程', 4 => '全平台'];
 
     const timeType = ['create_time' => '添加记录时间', 'update_time' => '修改记录时间', 'last_follow' => '最后跟进时间', 'next_follow' => '下次跟进时间', 'travel_date' => '出行时间', 'create_at' => '下单时间'];
 

service/app/server/Meituan.php

@@ -10,11 +10,9 @@ class Meituan {
     private $cookie = '';
     private $gate = 'https://lvyou.meituan.com';
     public $totalPage = 6;
-    public $os;
 
-    public function __construct($os = 1)
+    public function __construct()
     {
-        $this->os = $os;
         $this->cookie = $this->_cookie();
     }
 
@@ -53,7 +51,7 @@ class Meituan {
 
         $params = [
             'page' => $page,
-            'count' => 50,
+            'count' => 20,
             'orderId' => $orderId,
             'productId' => '',
             'orderTimeTo' => $end ?? '',
@@ -76,6 +74,10 @@ class Meituan {
             }
         }
 
+        if($list && $list->code == 0) {
+            $this->totalPage = $list->data->totalPage;
+        }
+
         $_list = [];
         if($list && $list->code == 0 && $list->data && is_array($list->data->orderList)) {
             foreach($list->data->orderList as  $order) {
@@ -86,7 +88,7 @@ class Meituan {
                     sleep(100);
                 }
                 $item = new Orders();
-                $item->os = $this->os;
+                $item->os = 1;
                 $item->sn = $order->orderId;
                 $item->product_id = $order->productId;
                 $item->product_name = $order->productName;
@@ -112,9 +114,8 @@ class Meituan {
     }
 
     public function _cookie($data = '') {
-        $key = sprintf('Meituan:cookie-%s', $this->os);
+        if($data) Redis::set('Meituan:cookie', $data);
-        if($data) Redis::set($key, $data);
+        return Redis::get('Meituan:cookie');
-        return Redis::get($key);
     }
 
     public function _curl($url, $params, $method = 'GET') {
@@ -143,10 +144,6 @@ class Meituan {
 
         curl_setopt($ch, CURLOPT_COOKIE, $this->_cookie());
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        if ($this->os == 7) {
-            echo $this->os . $http;
-            echo $this->_cookie();
-        }
         curl_setopt($ch, CURLOPT_HTTPHEADER, $header);
         if($method == 'POST') {
             curl_setopt($ch, CURLOPT_POST, true);

service/app/server/Orders.php

@@ -92,8 +92,7 @@ class Orders {
 
         switch ($order->os) {
             case 1:
-            case 7:
+                $mt = new Meituan();
-                $mt = new Meituan($order->os);
                 $it = $mt->get(1, null, null, $order->sn);
 
                 if ($it) {
@@ -174,8 +173,7 @@ class Orders {
         $got = null;
         switch ($order->os) {
             case 1:
-            case 7:
+                $mt = new Meituan();
-                $mt = new Meituan($order->os);
                 $it = $mt->get(1, null, null, $order->sn);
 
                 if ($it) {