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

fix : order pick code box num

Browse Source
This commit is contained in:
ctexthuang
2025-08-06 17:10:28 +08:00
parent 5cc59bb505
commit a6bdfa3e4c
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,10 @@ declare(strict_types=1);
namespace App\Service\Api\Order; namespace App\Service\Api\Order;
use App\Cache\Redis\Api\SiteCache; use App\Cache\Redis\Api\SiteCache;
use App\Cache\Redis\Common\ConfigCache;
use App\Constants\Common\GoodCode; use App\Constants\Common\GoodCode;
use App\Constants\Common\OrderCode; use App\Constants\Common\OrderCode;
use App\Constants\ConfigCode;
use App\Exception\ErrException; use App\Exception\ErrException;
use App\Model\AdminUser; use App\Model\AdminUser;
use App\Model\Chef; use App\Model\Chef;
@@ -69,6 +71,12 @@ class OrderInfoService extends BaseService
#[Inject] #[Inject]
protected SiteCache $siteCache; protected SiteCache $siteCache;
/**
* @var ConfigCache
*/
#[Inject]
protected ConfigCache $configCache;
/** /**
* @return array * @return array
* @throws ContainerExceptionInterface * @throws ContainerExceptionInterface
@@ -147,11 +155,20 @@ class OrderInfoService extends BaseService
} }
for ($i = 1; $i <= (count($newOrderSkuList) ?? 0); $i++) { for ($i = 1; $i <= (count($newOrderSkuList) ?? 0); $i++) {
$pickupCodeOneCopies = $pickupCodeArrList[$order['id']][$i]['pickup_code'] ?? null;
$boxNum = 0;
if (!empty($pickupCodeOneCopies)) {
$pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
}
$oneCopiesInfo = [ $oneCopiesInfo = [
'total_price' => '0.00', 'total_price' => '0.00',
'total_quantity' => 0, 'total_quantity' => 0,
'sku_list' => [], 'sku_list' => [],
'pickup_code' => $pickupCodeList[$i] ?? '', //取餐码 'pickup_code' => $pickupCodeOneCopies ?? '', // 取餐码
'box_num' => $boxNum,
'is_add_staple_food' => GoodCode::IS_NOT_ADD_STAPLE_FOOD, 'is_add_staple_food' => GoodCode::IS_NOT_ADD_STAPLE_FOOD,
]; ];

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

@@ -11,8 +11,10 @@ declare(strict_types=1);
namespace App\Service\Api\Order; namespace App\Service\Api\Order;
use App\Cache\Redis\Api\SiteCache; use App\Cache\Redis\Api\SiteCache;
use App\Cache\Redis\Common\ConfigCache;
use App\Constants\Common\GoodCode; use App\Constants\Common\GoodCode;
use App\Constants\Common\OrderCode; use App\Constants\Common\OrderCode;
use App\Constants\ConfigCode;
use App\Model\Order; use App\Model\Order;
use App\Model\OrderGood; use App\Model\OrderGood;
use App\Model\PickupCode; use App\Model\PickupCode;
@@ -61,6 +63,12 @@ class OrderListService extends BaseService
#[Inject] #[Inject]
protected SiteCache $siteCache; protected SiteCache $siteCache;
/**
* @var ConfigCache
*/
#[Inject]
protected ConfigCache $configCache;
/** /**
* @return array * @return array
* @throws ContainerExceptionInterface * @throws ContainerExceptionInterface
@@ -164,6 +172,7 @@ class OrderListService extends BaseService
'total_price' => '0.00', 'total_price' => '0.00',
'total_quantity' => 0, 'total_quantity' => 0,
'pickup_code' => '', //这个没有取餐码 'pickup_code' => '', //这个没有取餐码
'box_num' => 0,
'image_list' => [], 'image_list' => [],
'is_add_staple_food' => GoodCode::IS_ADD_STAPLE_FOOD, 'is_add_staple_food' => GoodCode::IS_ADD_STAPLE_FOOD,
]; ];
@@ -171,11 +180,18 @@ class OrderListService extends BaseService
for ($i = 1; $i <= (count($newOrderSkuList[$order['id']]) ?? 0); $i++) { for ($i = 1; $i <= (count($newOrderSkuList[$order['id']]) ?? 0); $i++) {
$breakFlag = 0; $breakFlag = 0;
$pickupCodeOneCopies = $pickupCodeArrList[$order['id']][$i]['pickup_code'] ?? null;
$boxNum = 0;
if (!empty($pickupCodeOneCopies)) {
$pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
}
$oneCopiesInfo = [ $oneCopiesInfo = [
'total_price' => '0.00', 'total_price' => '0.00',
'total_quantity' => 0, 'total_quantity' => 0,
'image_list' => [], 'image_list' => [],
'pickup_code' => $pickupCodeArrList[$order['id']][$i]['pickup_code'] ?? '', // 取餐码 'pickup_code' => $pickupCodeOneCopies ?? '', // 取餐码
'box_num' => $boxNum,
'is_add_staple_food' => GoodCode::IS_NOT_ADD_STAPLE_FOOD, 'is_add_staple_food' => GoodCode::IS_NOT_ADD_STAPLE_FOOD,
]; ];