From 2d93ba12f57533843078b20d9c4456c1b8f2cc7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Wed, 9 Aug 2023 17:45:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E6=89=93=E5=8D=B0=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E9=99=90=E5=88=B6=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Business/BusinessOrderController.php | 5 ++++-
 app/Services/Ship/WayBillService.php                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Business/BusinessOrderController.php b/app/Http/Controllers/Business/BusinessOrderController.php
index 9ad34da..d18e685 100644
--- a/app/Http/Controllers/Business/BusinessOrderController.php
+++ b/app/Http/Controllers/Business/BusinessOrderController.php
@@ -200,7 +200,10 @@ class BusinessOrderController extends Controller
         $data = [];
         foreach ($documents as &$document) {
             $documentID = $document['documentID'];
-            unset($document['documentID']);
+            foreach ($document['items'] as $item) {
+                $documentData['data']['list'][0]['text'] .= $item['name'] . ' ' . $item['count'] . '件;';
+            }
+            unset($document['documentID'], $document['items'], $document['order_id']);
             $data[] = [
                 'documentID' => $documentID,
                 'contents' => [
diff --git a/app/Services/Ship/WayBillService.php b/app/Services/Ship/WayBillService.php
index 3d8661b..1128294 100644
--- a/app/Services/Ship/WayBillService.php
+++ b/app/Services/Ship/WayBillService.php
@@ -93,7 +93,7 @@ class WayBillService
             $hasIds = array_merge($hasIds, $docIds);
             foreach ($docIds as $docId) {
                 $orderIds[] = $contents[$docId]['order_id'];
-                unset($contents[$docId]['items'], $contents[$docId]['order_id']);
+//                unset($contents[$docId]['items'], $contents[$docId]['order_id']);
                 $documents[] = $contents[$docId];
             }
         }