From 3c829efb54c7e3bdc634d39dba001c222b108daf Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Tue, 22 Apr 2025 13:49:15 +0800
Subject: [PATCH] sth

---
 application/admin/controller/orders/Dispatch2.php     |  2 +-
 application/admin/model/OrderDispatch.php             |  2 +-
 application/common/command/CheckOrdeRecordCommand.php |  9 ++++++++-
 public/assets/js/backend/orders/dispatch2.js          | 10 +++++-----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index a4a3cd6..e0d709b 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -69,7 +69,7 @@ class Dispatch2 extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                ->with(['order'])
+                ->with(['orderb'])
                 ->auth($this->auth)
                 ->where($where)
                 ->order($sort, $order)
diff --git a/application/admin/model/OrderDispatch.php b/application/admin/model/OrderDispatch.php
index 9ca957d..a1ce076 100644
--- a/application/admin/model/OrderDispatch.php
+++ b/application/admin/model/OrderDispatch.php
@@ -116,7 +116,7 @@ class OrderDispatch extends Model
     }
 
 
-    public function order()
+    public function orderb()
     {
         return $this->belongsTo('Order', 'order_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
diff --git a/application/common/command/CheckOrdeRecordCommand.php b/application/common/command/CheckOrdeRecordCommand.php
index 05a5b38..7861e4a 100644
--- a/application/common/command/CheckOrdeRecordCommand.php
+++ b/application/common/command/CheckOrdeRecordCommand.php
@@ -2,6 +2,7 @@
 
 namespace app\common\command;
 
+use app\admin\model\Message;
 use app\admin\model\OrderDispatch;
 use app\admin\model\OrderDispatchRecord;
 
@@ -33,7 +34,13 @@ class CheckOrdeRecordCommand extends Command
                     $dispatchIds[] = $item->dispatch_id;
                     //修改状态
                     if($item->need_notice == 1){    //需要通知
-
+                        $dispatch = OrderDispatch::get($item->dispatch_id,['orderb']);
+                        Message::create([
+                            'to_id'         =>  $dispatch->admin_id,
+                            'type'          =>  1,
+                            'title'         =>  '派单任务跟进提醒',
+                            'content'       =>  '订单编号:'.$dispatch->orderb->order_no.'，请及时关注。'
+                        ]);
                     }
                 }
                 OrderDispatchRecord::whereIn('id',$ids)->update(['status'=>1]);
diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js
index 1c9809d..8b229e9 100644
--- a/public/assets/js/backend/orders/dispatch2.js
+++ b/public/assets/js/backend/orders/dispatch2.js
@@ -96,12 +96,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
 
                         //{field: 'order.source_shop', title: __('Order.source_shop'), operate: '='},
                        // {field: 'order.source', title: __('Order.source')},
-                        {field: 'order.customer', title: __('Order.customer'), operate: false},
-                        {field: 'order.tel', title: __('Order.tel'), operate: '='},
-                        {field: 'order.address', title: __('Order.address'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'orderb.customer', title: __('Order.customer'), operate: false},
+                        {field: 'orderb.tel', title: __('Order.tel'), operate: '='},
+                        {field: 'orderb.address', title: __('Order.address'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
-                        {field: 'order.item_title', title: __('Order.item_title'), operate: false},
-                        {field: 'order.detail', title: __('Order.detail'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'orderb.item_title', title: __('Order.item_title'), operate: false},
+                        {field: 'orderb.detail', title: __('Order.detail'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
                         {field: 'order.images', title: __('Order.images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'arrive_time', title: __('上门时间'), operate:false, addclass:'datetimerange', autocomplete:false},