Compare commits

..

3 Commits

Author SHA1 Message Date
44a500df9f fix : date 2025-08-06 17:24:43 +08:00
1a962ecb39 fix : date 2025-08-06 17:22:10 +08:00
24a911d63a fix : user default address 2025-08-06 17:18:36 +08:00
4 changed files with 4 additions and 4 deletions

View File

@@ -91,6 +91,6 @@ class UserSite extends Model
*/ */
public function getUserDefaultInfoByUserId(int $userId) public function getUserDefaultInfoByUserId(int $userId)
{ {
return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_NO_DEFAULT)->first(); return $this->where('user_id', $userId)->where('is_default',SiteCode::USER_DEFAULT)->first();
} }
} }

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

@@ -160,7 +160,7 @@ class OrderInfoService 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(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(end($pickupCodeOneCopiesArr) ?? 0 / (int)$this->configCache->getConfigValueByKey(ConfigCode::MAXIMUM_VALUE_IN_FULL_BOX));
} }
$oneCopiesInfo = [ $oneCopiesInfo = [
'total_price' => '0.00', 'total_price' => '0.00',