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]; } }