ufutx/ufutx.dma
4
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

food

Browse Source
This commit is contained in:
Hankin 2026-05-26 10:28:54 +08:00
parent 04ab1ec6a9
commit fc7c6757f4
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/H5/GuideController.php
View File

@ -296,16 +296,16 @@ class GuideController extends Controller
$scheme[$key]['config'] = json_decode($config, true); $scheme[$key]['config'] = json_decode($config, true);
} }
} }
$foods = Food::where('type', Food::TYPE_FOOD)->select('id', 'name', 'icon', 'unit', 'price', 'stock as num', 'type', 'config')->orderByDesc('id')->get()?->toArray(); // $foods = Food::where('type', Food::TYPE_FOOD)->select('id', 'name', 'icon', 'unit', 'price', 'stock as num', 'type', 'config')->orderByDesc('id')->get()?->toArray();
foreach ($foods as $k => $v) { // foreach ($foods as $k => $v) {
if (empty($v['config'])) { // if (empty($v['config'])) {
continue; // continue;
} // }
$foods[$k]['config'] = json_decode($v['config'], true); // $foods[$k]['config'] = json_decode($v['config'], true);
} // }
// 合并 $scheme 和 $foods 数组 // // 合并 $scheme 和 $foods 数组
$result = array_merge($scheme, $foods); // $result = array_merge($scheme, $foods);
return $this->success('ok', $result); return $this->success('ok', $scheme);
} catch (\Exception $e) { } catch (\Exception $e) {
AddErrorLog::dispatch('getOrderFood file:' . $e->getFile() . ' line:' . $e->getLine() . ' message:' . $e->getMessage())->onQueue('health'); AddErrorLog::dispatch('getOrderFood file:' . $e->getFile() . ' line:' . $e->getLine() . ' message:' . $e->getMessage())->onQueue('health');
return $this->failure('获取失败'); return $this->failure('获取失败');