Compare commits

...

2 Commits

Author SHA1 Message Date
1a962ecb39 fix : date 2025-08-06 17:22:10 +08:00
24a911d63a fix : user default address 2025-08-06 17:18:36 +08:00
2 changed files with 2 additions and 2 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',