hehele/hyperf_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat : chef name

Browse Source
This commit is contained in:
ctexthuang
2025-04-10 16:21:28 +08:00
parent a8523ed797
commit 89fbd03239
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Service/Api/Order/OrderInfoService.php
View File

@@ -146,7 +146,7 @@ class OrderInfoService extends BaseService
]; ];
} }
for ($i = 1; $i <= ($orderInfo['copies'] ?? 0); $i++) { for ($i = 1; $i <= (count($newOrderSkuList) ?? 0); $i++) {
$oneCopiesInfo = [ $oneCopiesInfo = [
'total_price' => '0.00', 'total_price' => '0.00',
'total_quantity' => 0, 'total_quantity' => 0,
@@ -166,6 +166,8 @@ class OrderInfoService extends BaseService
$addStapleFood['total_price'] = bcadd((string)$oneCopiesInfo['total_price'], bcmul((string)$item['unit_price'],(string)$item['quantity'],2), 2); $addStapleFood['total_price'] = bcadd((string)$oneCopiesInfo['total_price'], bcmul((string)$item['unit_price'],(string)$item['quantity'],2), 2);
$addStapleFood['total_quantity'] += $item['quantity']; $addStapleFood['total_quantity'] += $item['quantity'];
$addStapleFood['url'] = $imageList[$imageId]['url'] ?? ''; $addStapleFood['url'] = $imageList[$imageId]['url'] ?? '';
$addStapleFood['title'] = $skuList[$item['sku_id']]['title'] ?? '';
$addStapleFood['unit_price'] = $item['unit_price'];
$breakFlag = 1; $breakFlag = 1;
continue; continue;
} }

6
app/Service/Api/Order/OrderListService.php
View File

@@ -169,7 +169,7 @@ class OrderListService extends BaseService
]; ];
} }
for ($i = 1; $i <= ($order['copies'] ?? 0); $i++) { for ($i = 1; $i <= (count($newOrderSkuList[$order['id']]) ?? 0); $i++) {
$breakFlag = 0; $breakFlag = 0;
$oneCopiesInfo = [ $oneCopiesInfo = [
'total_price' => '0.00', 'total_price' => '0.00',
@@ -183,12 +183,15 @@ class OrderListService extends BaseService
if ($item['order_id'] != $order['id'] || $item['copies'] != $i) continue; if ($item['order_id'] != $order['id'] || $item['copies'] != $i) continue;
$skuInfo = $skuList[$item['sku_id']] ?? []; $skuInfo = $skuList[$item['sku_id']] ?? [];
if ($order['id'] == 134) var_dump($skuInfo);
$imageId = !empty($skuInfo) && !empty(explode(',',$skuInfo['image_ids'])[0]) ? explode(',',$skuInfo['image_ids'])[0] : []; $imageId = !empty($skuInfo) && !empty(explode(',',$skuInfo['image_ids'])[0]) ? explode(',',$skuInfo['image_ids'])[0] : [];
if ($skuInfo['is_add_staple_food'] == GoodCode::IS_ADD_STAPLE_FOOD) { if ($skuInfo['is_add_staple_food'] == GoodCode::IS_ADD_STAPLE_FOOD) {
$addStapleFood['total_price'] = bcadd((string)$oneCopiesInfo['total_price'], bcmul((string)$item['unit_price'],(string)$item['quantity'],2), 2); $addStapleFood['total_price'] = bcadd((string)$oneCopiesInfo['total_price'], bcmul((string)$item['unit_price'],(string)$item['quantity'],2), 2);
$addStapleFood['total_quantity'] += $item['quantity']; $addStapleFood['total_quantity'] += $item['quantity'];
$addStapleFood['image_list'][] = $imageList[$imageId]['url'] ?? ''; $addStapleFood['image_list'][] = $imageList[$imageId]['url'] ?? '';
$addStapleFood['title'] = $skuInfo['title'] ?? '';
$addStapleFood['unit_price'] = $item['unit_price'];
$breakFlag = 1; $breakFlag = 1;
continue; continue;
} }
@@ -201,6 +204,7 @@ class OrderListService extends BaseService
if ($breakFlag == 0) $orderCopiesList[] = $oneCopiesInfo; if ($breakFlag == 0) $orderCopiesList[] = $oneCopiesInfo;
} }
if (!empty($addStapleFood) && $addStapleFood['total_quantity'] >= 0) $orderCopiesList[] = $addStapleFood; if (!empty($addStapleFood) && $addStapleFood['total_quantity'] >= 0) $orderCopiesList[] = $addStapleFood;
$order['copies_list'] = $orderCopiesList; $order['copies_list'] = $orderCopiesList;
$order['site'] = $this->siteCache->getSiteInfo((int)$order['site_id']) ?? []; $order['site'] = $this->siteCache->getSiteInfo((int)$order['site_id']) ?? [];