From c755199298ee97551fd99ce93ba775ad4d56c47e Mon Sep 17 00:00:00 2001 From: denghy Date: Fri, 15 Nov 2019 12:50:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Domains/Virtual/Services/OrderService.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Domains/Virtual/Services/OrderService.php b/app/Domains/Virtual/Services/OrderService.php index 7e79551d..93cc80e2 100644 --- a/app/Domains/Virtual/Services/OrderService.php +++ b/app/Domains/Virtual/Services/OrderService.php @@ -676,15 +676,20 @@ class OrderService extends Service $orderCards = []; foreach ($res as $card) { + $counts = isset($orderShipments[$card->sim]) ? $orderShipments[$card->sim] + $cards[$card->sim] : $cards[$card->sim]; + $counts = intval($counts); + + $created_at = Carbon::parse($order->order_at)->format('Y-m-d H:i:s'); + $orderCards[] = [ 'type' => $order['type'], 'sim' => $card->sim, 'order_id' => $orderId, 'company_id' => $order['company_id'], 'package_id' => $order['package_id'], - 'counts' => isset($orderShipments[$card->sim]) ? $orderShipments[$card->sim] + $cards[$card->sim] : $cards[$card->sim], + 'counts' => $counts, 'unit_price' => $order['unit_price'], - 'created_at' => $order->order_at, + 'created_at' => $created_at, 'updated_at' => date('Y-m-d H:i:s'), ]; };