Compare commits

...

4 Commits

Author SHA1 Message Date
fdb5d99214 fix : order 2025-08-06 17:58:50 +08:00
b202835205 fix : order 2025-08-06 17:43:26 +08:00
44a500df9f fix : date 2025-08-06 17:24:43 +08:00
1a962ecb39 fix : date 2025-08-06 17:22:10 +08:00
3 changed files with 4 additions and 4 deletions

View File

@@ -47,7 +47,7 @@ class FinancesService extends BaseService
->when($searchKitchenId, function ($query) use ($searchKitchenId) { ->when($searchKitchenId, function ($query) use ($searchKitchenId) {
$query->where('kitchen_id', $searchKitchenId); $query->where('kitchen_id', $searchKitchenId);
}) })
->groupBy('cycle_id') ->groupBy('cycle_id','date')
->orderByDesc('cycle_id') ->orderByDesc('cycle_id')
->select( ->select(
'date', 'date',

View File

@@ -156,11 +156,11 @@ 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; $pickupCodeOneCopies = $pickupCodeList[$i] ?? null;
$boxNum = 0; $boxNum = 0;
if (!empty($pickupCodeOneCopies)) { if (!empty($pickupCodeOneCopies)) {
$pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies); $pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX)); $boxNum = ceil((int)(end($pickupCodeOneCopiesArr) ?? 0) / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
} }
$oneCopiesInfo = [ $oneCopiesInfo = [

View File

@@ -184,7 +184,7 @@ class OrderListService extends BaseService
$boxNum = 0; $boxNum = 0;
if (!empty($pickupCodeOneCopies)) { if (!empty($pickupCodeOneCopies)) {
$pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies); $pickupCodeOneCopiesArr = explode('-', $pickupCodeOneCopies);
$boxNum = ceil(end($pickupCodeOneCopiesArr) ?? '0' / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX)); $boxNum = ceil((int)(end($pickupCodeOneCopiesArr) ?? 0) / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
} }
$oneCopiesInfo = [ $oneCopiesInfo = [
'total_price' => '0.00', 'total_price' => '0.00',