diff --git a/app/Service/Api/Driver/BaseDriverService.php b/app/Service/Api/Driver/BaseDriverService.php index ac4da60..ff39e5a 100644 --- a/app/Service/Api/Driver/BaseDriverService.php +++ b/app/Service/Api/Driver/BaseDriverService.php @@ -151,7 +151,6 @@ abstract class BaseDriverService extends BaseService $skuArr = $this->skuModel->getDataArrByIds($skuIds); $skuArr = array_column($skuArr,null,'id'); - $res = []; foreach ($mealArr as $oneLog) { if (empty($res[$oneLog['site_id']])) { @@ -231,9 +230,9 @@ abstract class BaseDriverService extends BaseService 'site_name' => $site['name'], 'driver_id' => $this->adminInfo->id, 'line_name' => '', - 'meal_order_quantity' => $mealArr[$site['id']]['quantity'] ?? 0, + 'meal_order_quantity' => $mealArr[$site['id']]['total_copies'] ?? 0, 'meal_add_staple_food_num' => $mealArr[$site['id']]['add_staple_food_num'] ?? 0, - 'meal_list' => $mealArr[$site['id']]['sku'] ?? [], + 'meal_list' => !empty($mealArr[$site['id']]['sku']) ? array_values($mealArr[$site['id']]['sku']) : [], 'option_order_quantity' => $optionArr[$site['id']]['copies'] ?? 0, 'option_add_staple_food_num' => $optionArr[$site['id']]['add_staple_food_num'] ?? 0, 'status' => DriverCode::NO_DEPARTURES,