From 7ace9cc65c60b2b9a19ceb9b3fdb94285487bfae Mon Sep 17 00:00:00 2001
From: gcd <wyemail666@163.com>
Date: Tue, 1 Apr 2025 16:29:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/model/Order.php            | 5 ++++-
 application/services/OrderDispatchService.php | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/common/model/Order.php b/application/common/model/Order.php
index 278eb6f..2c60e3b 100644
--- a/application/common/model/Order.php
+++ b/application/common/model/Order.php
@@ -14,5 +14,8 @@ class Order extends Model
 
     ];
 
-
+    public function area()
+    {
+        return $this->belongsTo(\app\admin\model\Area::class,'area_id', 'area_code');
+    }
 }
diff --git a/application/services/OrderDispatchService.php b/application/services/OrderDispatchService.php
index 009e93d..9abfbed 100644
--- a/application/services/OrderDispatchService.php
+++ b/application/services/OrderDispatchService.php
@@ -10,7 +10,9 @@ class OrderDispatchService extends BaseService
     {
         return $this->getOrderDispatchModel()
             ->with(['orderInfo' => function ($query) {
-                $query->field('id,order_no,item_id,item_title,receive_type,address,lng,lat,plan_time,online_amount,discount_amount');
+                $query->with(['area' => function ($query) {
+                    $query->field('id,area_code,merge_name');
+                }])->field('id,order_no,item_id,item_title,receive_type,address,lng,lat,plan_time,online_amount,discount_amount,area_id');
             }])
             ->where('status', OrderDispatch::STATUS_TOGET)
             ->where('worker_id', $workerId)