From 630a30bd414d157b5df069b52d53ff7c9c16b63e Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 24 Aug 2020 10:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=BA=BF=E4=B8=8A=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=B5=81=E6=B0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Service/FeiePrintService.php | 3 +++ app/Service/OrderService.php | 2 +- app/Service/SeparateAccountsService.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Service/FeiePrintService.php b/app/Service/FeiePrintService.php index 9f8f31d..114510b 100644 --- a/app/Service/FeiePrintService.php +++ b/app/Service/FeiePrintService.php @@ -37,6 +37,9 @@ class FeiePrintService implements FeiePrintServiceInterface ->orderBy('s.id') ->get() ->toArray(); + if (empty($data)) { + return ; + } foreach ($data as $key => &$item) { $item = (array)$item; } diff --git a/app/Service/OrderService.php b/app/Service/OrderService.php index fd918bd..6b02129 100644 --- a/app/Service/OrderService.php +++ b/app/Service/OrderService.php @@ -100,7 +100,7 @@ class OrderService implements OrderServiceInterface $storeOrderCounts = []; foreach ($countsArr as $key => &$row) { - $storeOrderCounts[$row['id']] = $row['count']; + $storeOrderCounts[$row['store_id']] = $row['count']; } // 循环处理订单总额、子订单总额、商品、商户订单等信息 diff --git a/app/Service/SeparateAccountsService.php b/app/Service/SeparateAccountsService.php index 4217a24..3f89a5c 100644 --- a/app/Service/SeparateAccountsService.php +++ b/app/Service/SeparateAccountsService.php @@ -59,7 +59,7 @@ class SeparateAccountsService implements SeparateAccountsServiceInterface } // =======用户支付流水 / Start======= - $this->financialRecordService->userByOFLOrderPaid($orderMain->user_id, $global_order_id, $orderMain->money); + $this->financialRecordService->userByOLOrderPaid($orderMain->user_id, $global_order_id, $orderMain->money); // =======用户支付流水 / End======= }