From d0efa47ab3869cce3478ac00bf765c9419c5e130 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Tue, 17 Jun 2025 15:22:26 +0800
Subject: [PATCH] sth

---
 .../admin/behavior/OrderDispatchLog.php       | 53 ++++++++++---------
 .../controller/orders/Dispatchrecord.php      |  1 +
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/application/admin/behavior/OrderDispatchLog.php b/application/admin/behavior/OrderDispatchLog.php
index 26c103e..9708c55 100644
--- a/application/admin/behavior/OrderDispatchLog.php
+++ b/application/admin/behavior/OrderDispatchLog.php
@@ -35,34 +35,37 @@ class OrderDispatchLog
             ];
             \app\admin\model\OrderDispatchLog::create($data);
 
-            if($dispatch->status == OrderDispatch::STATUS_TOGET)
-            {
-                $alibaba_dyvms = config('alibaba_dyvms');
 
-                if($alibaba_dyvms['status']){
-                    $data = [
-                        'order_id' => $dispatch->order_id,
-                        'dispatch_id' => $dispatch->id,
-                        'type'        =>    1,
-                        'outid'       => md5(time().rand(1000,9999).rand(1000,9999)),
-                        'create_time' => date('Y-m-d H:i:s'),
-                        'status'    =>  $alibaba_dyvms['sync']?1:0
-                    ];
-                    $service = new NoticeLogic();
-                    $service->dispatchNotice($dispatch);
-                    TtsLog::create($data);
-                }
-            }
+            if(!isset($dispatch->from_record)){         //不是来自于跟进
+                if($dispatch->status == OrderDispatch::STATUS_TOGET)
+                {
+                    $alibaba_dyvms = config('alibaba_dyvms');
 
-            if($dispatch->type == 2){
-                if($dispatch->status == OrderDispatch::STATUS_GOTIT){
-                    $Order = Order::get($dispatch->order_id);
-                    SendMailLogic::sendToCustomStart($Order->tel,$dispatch->worker_name,$dispatch->worker_tel);
+                    if($alibaba_dyvms['status']){
+                        $data = [
+                            'order_id' => $dispatch->order_id,
+                            'dispatch_id' => $dispatch->id,
+                            'type'        =>    1,
+                            'outid'       => md5(time().rand(1000,9999).rand(1000,9999)),
+                            'create_time' => date('Y-m-d H:i:s'),
+                            'status'    =>  $alibaba_dyvms['sync']?1:0
+                        ];
+                        $service = new NoticeLogic();
+                        $service->dispatchNotice($dispatch);
+                        TtsLog::create($data);
+                    }
                 }
-            }elseif($dispatch->type == 1){
-                if($dispatch->status == OrderDispatch::STATUS_TOGET){
-                    $Order = Order::get($dispatch->order_id);
-                    SendMailLogic::sendToCustomStart($Order->tel,$dispatch->worker_name,$dispatch->worker_tel);
+
+                if($dispatch->type == 2){
+                    if($dispatch->status == OrderDispatch::STATUS_GOTIT){
+                        $Order = Order::get($dispatch->order_id);
+                        SendMailLogic::sendToCustomStart($Order->tel,$dispatch->worker_name,$dispatch->worker_tel);
+                    }
+                }elseif($dispatch->type == 1){
+                    if($dispatch->status == OrderDispatch::STATUS_TOGET){
+                        $Order = Order::get($dispatch->order_id);
+                        SendMailLogic::sendToCustomStart($Order->tel,$dispatch->worker_name,$dispatch->worker_tel);
+                    }
                 }
             }
         }catch (Exception $exception){
diff --git a/application/admin/controller/orders/Dispatchrecord.php b/application/admin/controller/orders/Dispatchrecord.php
index 38bd945..b7ac873 100644
--- a/application/admin/controller/orders/Dispatchrecord.php
+++ b/application/admin/controller/orders/Dispatchrecord.php
@@ -140,6 +140,7 @@ class Dispatchrecord extends Backend
 
                         $dispatch->admin_user = $groupName.'：'. $this->auth->nickname;
                         $dispatch->record_images =   $params['images'];
+                        $dispatch->from_record =   $params['images'];
                         $hookParams = [
                             'dispatch'  =>  $dispatch,
                             'remark'    =>  '跟进订单，跟进内容：'.$params['remark'],