增加预约字段

admin/src/views/order/index.vue

@@ -78,6 +78,17 @@
         :default-time="['00:00:00', '23:59:59']"
         end-placeholder="结束日期"
       />
+      <el-select
+        v-model="listQuery.appointment_status"
+        filterable
+        placeholder="预约状态"
+        class="filter-item"
+        style="width: 120px"
+      >
+        <el-option key="" label="请选择" value="" />
+        <el-option key="1" label="已预约" value="1" />
+        <el-option key="0" label="未预约" value="0" />
+      </el-select>
 
       <el-button
         class="filter-item"
@@ -201,6 +212,21 @@
         </template>
       </el-table-column>
 
+      <el-table-column align="center" label="预约状态（抖音）" width="80">
+        <template slot-scope="scope">
+          <div
+            style="padding: 1px 5px; border-radius: 3px"
+            :style="{
+              color: order_status[scope.row.appointment_status],
+              border: `1px solid ${order_status[scope.row.appointment_status]}`,
+            }"
+            type="primary"
+          >
+            {{ scope.row.appointment_status == 1 ? '已预约' : '未预约' }}
+          </div>
+        </template>
+      </el-table-column>
+
       <el-table-column align="center" label="状态" width="80">
         <template slot-scope="scope">
           <div

service/app/admin/controller/OrderController.php

@@ -32,6 +32,10 @@ class OrderController extends base
             $where[] = ['sn','=', $sn];
         }
 
+//        if (in_array($appointment_status, [0, 1])) {
+//            $where[] = ['appointment_status', '=', $appointment_status];
+//        }
+
         $status = $request->get('status', null);
 
         $query = Orders::attimes($timetype, $times)->with(['admin','anchor','backs'])->where($where)
@@ -51,6 +55,11 @@ class OrderController extends base
             $query->where('status', $status);
         }
 
+        $appointment_status = $request->get('appointment_status', null);
+        if($appointment_status!=null && $appointment_status >= 0) {
+            $query->where('appointment_status', $appointment_status);
+        }
+
         $mobile = $request->get('mobile');
         if($mobile){
             $query->where('mobile','like', '%'.$mobile.'%');

service/app/server/Douyin.php

@@ -170,7 +170,6 @@ class Douyin
                 throw new Exception("抖音拉单{$order->order_id}详情获取失败");
             }
 
-
             $item = new Orders();
             $item->os = 3;
             $item->sn = $order->order_id;
@@ -414,6 +413,30 @@ class Douyin
         return $orderDetail->data ?? null;
     }
 
+    /**
+     * @param string $orderId
+     * @return array|null
+     */
+    public function _orderMakeAppointmentStatus(string $orderId)
+    {
+        if (empty($orderId)) return [];
+        $params = [
+            'page_index' => 1,
+            'page_size'  => 50,
+            'status'     => 3,
+            'order_id'   => $orderId,
+            'sku_name'   => '',
+            'last_phone' => '',
+            'category'   => [
+                "third_category_list" => []
+            ]
+        ];
+
+        $orderBookingManagement = $this->_curl('/life/trade_view/v1/travel_agency/book/search?root_life_account_id=' . $this->_id(), $params, 'POST');
+
+        return $orderBookingManagement->order_list ?? null;
+    }
+
     public function _orderBookingManagement(string $orderId)
     {
         if (empty($orderId)) return [];

service/app/server/Orders.php

@@ -98,6 +98,14 @@ class Orders {
                 $it = $dy->get(1, null, null, $order->sn);
                 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;

service/public/static/css/chunk-1e96f91b.d7dea6fb.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-7e3d35b4]{position:relative;padding-bottom:60px}.el-table[data-v-7e3d35b4],.filter-container[data-v-7e3d35b4]{padding-bottom:5px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-56348a28]{position:relative;padding-bottom:60px}.el-table[data-v-56348a28],.filter-container[data-v-56348a28]{padding-bottom:5px}