From d3429f6c1b21d20969cac2a29308fc8b2cb9ec81 Mon Sep 17 00:00:00 2001
From: jianghanbo <jhba001200>
Date: Fri, 16 Aug 2024 22:20:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=96=E9=9F=B3=E5=A2=9E=E5=8A=A0=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/app/command/SpiderDy.php | 14 +-------------
 service/app/server/Douyin.php    |  2 +-
 service/app/server/Orders.php    | 26 ++------------------------
 3 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/service/app/command/SpiderDy.php b/service/app/command/SpiderDy.php
index b1f2687a..6deed990 100644
--- a/service/app/command/SpiderDy.php
+++ b/service/app/command/SpiderDy.php
@@ -331,17 +331,8 @@ class SpiderDy extends Command
                         break;*/
 
                     case 3:
-                        //                        echo '==========pages='.$pages;
-                        try {
-                            $dou = new Douyin($k);
-                            $list = $dou->get($page, $start, $end, '', $k);
-                            $pages = $dou->totalPage;
-                        } catch (\Exception $e) {
-                            Log::error(dirname(__FILE__) . __LINE__ . $e);
-                        }
-                        break;
                     case 5:
-                        //                        echo '==========pages='.$pages;
+//                        echo '==========pages='.$pages;
                         try {
                             $dou = new Douyin($k);
                             $list = $dou->get($page, $start, $end, '', $k);
@@ -443,9 +434,6 @@ class SpiderDy extends Command
                 $it = $m->get(1, null, null, $item->sn);
                 break;*/
             case 3:
-                $m = new Douyin($item->os);
-                $it = $m->get(1, null, null, $item->sn, $item->os);
-                break;
             case 5:
                 $m = new Douyin($item->os);
                 $it = $m->get(1, null, null, $item->sn, $item->os);
diff --git a/service/app/server/Douyin.php b/service/app/server/Douyin.php
index b199ecb5..d7369dea 100644
--- a/service/app/server/Douyin.php
+++ b/service/app/server/Douyin.php
@@ -247,7 +247,7 @@ class Douyin
 //        Log::error('===_certificateList查询page='.$page.'时间：'.date('Y-m-d H:i:s',$start).'--'.date('Y-m-d H:i:s',$end).'====');
         $this->_getRetriesLock();
 
-        $list = $this->_curl("/life/trip/fulfilment/v1/query/certificate_list?end_time={$end}&page_index={$page}&page_size=50&start_time={$start}&root_life_account_id=" . $this->_id(), $params, 'POST');
+        $list = $this->_curl("/life/trip/fulfilment/v1/query/certificate_list?end_time={$end}&page_index={$page}&page_size=50&start_time={$start}&root_life_account_id=" . $this->_id($osId), $params, 'POST');
 
         if (empty($list) || $list->status_code != 0) {
             $this->_getRetriesLock();
diff --git a/service/app/server/Orders.php b/service/app/server/Orders.php
index 5f9603cb..92ecdc90 100644
--- a/service/app/server/Orders.php
+++ b/service/app/server/Orders.php
@@ -96,21 +96,6 @@ class Orders {
 
                 break;
             case 3:
-                $dy = new Douyin($order->os);
-                $it = $dy->get(1, null, null, $order->sn, $order->os);
-                if ($it) {
-                    $got = $it[0];
-
-                    // 查询未预约状态
-                    if ($order->appointment_status != 1) {
-                        $appointment_status = $dy->_orderMakeAppointmentStatus($order->sn);
-                        if ($appointment_status !== null) {
-                            $got['appointment_status'] = 1;
-                        }
-                    }
-                }
-
-                break;
             case 5:
                 $dy = new Douyin($order->os);
                 $it = $dy->get(1, null, null, $order->sn, $order->os);
@@ -191,17 +176,10 @@ class Orders {
                 }
 
                 break;
+            case 3:
             case 5:
                 $dy = new Douyin($order->os);
-                $it = $dy->get(1, null, null, $order->os);
-                if ($it) {
-                    $got = $it[0];
-                }
-
-                break;
-            case 3:
-                $dy = new Douyin($order->os);
-                $it = $dy->get(1, null, null, $order->os);
+                $it = $dy->get(1, null, null, $order->sn);
                 if ($it) {
                     $got = $it[0];
                 }