hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 首页接口调整

Browse Source
This commit is contained in:
gcd 2025-04-01 16:29:11 +08:00
parent 0f0e5a467d
commit 7ace9cc65c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/common/model/Order.php
View File

@ -14,5 +14,8 @@ class Order extends Model
]; ];
public function area()
{
return $this->belongsTo(\app\admin\model\Area::class,'area_id', 'area_code');
}
} }

4
application/services/OrderDispatchService.php
View File

@ -10,7 +10,9 @@ class OrderDispatchService extends BaseService
{ {
return $this->getOrderDispatchModel() return $this->getOrderDispatchModel()
->with(['orderInfo' => function ($query) { ->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('status', OrderDispatch::STATUS_TOGET)
->where('worker_id', $workerId) ->where('worker_id', $workerId)