From 18d6dfee0654464740a69aaad5230b75e3a9ea2d Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Tue, 8 Aug 2023 14:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=96=E8=B4=A7=E3=80=81?=
 =?UTF-8?q?=E9=85=8D=E9=80=81=E3=80=81=E6=94=B6=E8=B4=A7=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/LogisticsController.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/api/controller/LogisticsController.php b/app/api/controller/LogisticsController.php
index df90773c..aba60373 100755
--- a/app/api/controller/LogisticsController.php
+++ b/app/api/controller/LogisticsController.php
@@ -80,6 +80,14 @@ class LogisticsController extends BaseApiController
                     }
                 )->toArray();
                 $item['product_count'] = count( $item['products']);
+                if($item['status'] == 3){
+                    $records = Db::name('logistics_record')->field('status,create_time')->where('lst_id', $item['id'])->order('create_time asc')->select()->toArray();
+                    foreach($records as $k=>$v){
+                        if($v['status'] == 1) $item['qh_time'] = date('Y-m-d H:i:s', $v['create_time']);
+                        if($v['status'] == 2) $item['pc_time'] = date('Y-m-d H:i:s', $v['create_time']);
+                        if($v['status'] == 3) $item['sh_time'] = date('Y-m-d H:i:s', $v['create_time']);
+                    }
+                }
                 return $item;
             }
         )->toArray();
@@ -234,6 +242,7 @@ class LogisticsController extends BaseApiController
         $record = [
             'lst_id' => $logistics['id'],
             'type' => 2,
+            'status' => 1,
             'user_name' => $courier['real_name']? $courier['real_name'] : $courier['nickname'],
             'user_phone' => $courier['mobile'],
             'content' => '已提取商品',
@@ -269,6 +278,7 @@ class LogisticsController extends BaseApiController
         $record = [
             'lst_id' => $logistics['id'],
             'type' => 2,
+            'status' => 2,
             'user_name' => $courier['real_name']? $courier['real_name'] : $courier['nickname'],
             'user_phone' => $courier['mobile'],
             'content' => '已完成配送',
@@ -302,6 +312,7 @@ class LogisticsController extends BaseApiController
         $record = [
             'lst_id' => $logistics['id'],
             'type' => 1,
+            'status' => 3,
             'user_name' => $logistics['user_name'],
             'user_phone' => $logistics['user_phone'],
             'content' => '已确认收货',
@@ -335,6 +346,7 @@ class LogisticsController extends BaseApiController
         $record = [
             'lst_id' => $logistics['id'],
             'type' => 1,
+            'status' => 4,
             'user_name' => $logistics['user_name'],
             'user_phone' => $logistics['user_phone'],
             'content' => '已取消订单',