From faa377a462100182a5c8927d177e7baf7ebe1448 Mon Sep 17 00:00:00 2001
From: jianghanbo <jhba001200>
Date: Fri, 16 Aug 2024 22:16:23 +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/Orders.php    | 26 ++++++++++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/service/app/command/SpiderDy.php b/service/app/command/SpiderDy.php
index 6deed990..b1f2687a 100644
--- a/service/app/command/SpiderDy.php
+++ b/service/app/command/SpiderDy.php
@@ -331,8 +331,17 @@ 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);
@@ -434,6 +443,9 @@ 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/Orders.php b/service/app/server/Orders.php
index 92ecdc90..5f9603cb 100644
--- a/service/app/server/Orders.php
+++ b/service/app/server/Orders.php
@@ -96,6 +96,21 @@ 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);
@@ -176,10 +191,17 @@ class Orders {
                 }
 
                 break;
-            case 3:
             case 5:
                 $dy = new Douyin($order->os);
-                $it = $dy->get(1, null, null, $order->sn);
+                $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);
                 if ($it) {
                     $got = $it[0];
                 }