spot-ticket · dbswjd7 · Feb 6, 2026 · Jan 2, 2026 · Jan 2, 2026 · Jan 4, 2026
diff --git a/FE/spot/app/admin/page.tsx b/FE/spot/app/admin/page.tsx
@@ -308,20 +308,20 @@ export default function AdminPage() {
                     </thead>
                     <tbody className="bg-white divide-y divide-gray-200">
                       {stats.recentOrders.map((order) => (
-                        <tr key={order.id}>
+                        <tr key={order.orderId}>
                           <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
-                            #{order.id}
+                            #{order.orderId}
                           </td>
                           <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
                             {order.storeName}
                           </td>
                           <td className="px-6 py-4 whitespace-nowrap">
                             <span className="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-green-100 text-green-800">
-                              {order.orderStatus}
+                              {order.status}
                             </span>
                           </td>
                           <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
-                            {order.totalAmount.toLocaleString()}원
+                            {Number(order.totalAmount ?? 0).toLocaleString()}원
                           </td>
                         </tr>
                       ))}
@@ -460,21 +460,21 @@ export default function AdminPage() {
                   </thead>
                   <tbody className="bg-white divide-y divide-gray-200">
                     {orders.content.map((order) => (
-                      <tr key={order.id}>
+                      <tr key={order.orderId}>
                         <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
-                          #{order.id}
+                          #{order.orderId}
                         </td>
                         <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
                           {order.storeName}
                         </td>
                         <td className="px-6 py-4 whitespace-nowrap text-sm text-gray-900">
-                          {order.totalAmount.toLocaleString()}원
+                          {Number(order.totalAmount ?? 0).toLocaleString()}원
                         </td>
                         <td className="px-6 py-4 whitespace-nowrap">
                           <select
-                            value={order.orderStatus}
+                            value={order.status}
                             onChange={(e) =>
-                              handleUpdateOrderStatus(order.id, e.target.value)
+                              handleUpdateOrderStatus(order.orderId, e.target.value)
                             }
                             className="text-sm border-gray-300 rounded-md"
                           >
@@ -495,7 +495,7 @@ export default function AdminPage() {
                             size="sm"
                             onClick={() => {
                               // 주문 상세 페이지로 이동 또는 모달 열기
-                              alert(`주문 #${order.id} 상세 정보`);
+                              alert(`주문 #${order.orderId} 상세 정보`);
                             }}
                           >
                             상세
@@ -671,6 +671,7 @@ export default function AdminPage() {
                   variant="outline"
                   disabled={storePage === 0}
                   onClick={() => loadStores(storePage - 1)}
+
                 >
                   이전
                 </Button>

diff --git a/FE/spot/app/cart/page.tsx b/FE/spot/app/cart/page.tsx
@@ -159,12 +159,12 @@ export default function CartPage() {
           title: `${cart.storeName} 주문`,
           content: `${cart.items.map((i) => i.menu.name).join(', ')}`,
           userId: user.id,
-          orderId: order.id,
+          orderId: order.orderId,
           paymentMethod,
           paymentAmount: getTotal(),
         };
 
-        await paymentApi.confirmPayment(order.id, paymentData);
+        await paymentApi.confirmPayment(order.orderId, paymentData);
 
         // 장바구니 비우기
         clearCart();
@@ -193,7 +193,7 @@ export default function CartPage() {
         const response = await tossPayments.requestBillingAuth('카드', {
           customerKey: customerKey,
           customerName: user.username,
-          successUrl: `${window.location.origin}/mypage/billing/success?orderId=${order.id}&paymentMethod=${paymentMethod}`,
+          successUrl: `${window.location.origin}/mypage/billing/success?orderId=${order.orderId}&paymentMethod=${paymentMethod}`,
           failUrl: `${window.location.origin}/payemnts/fail`,
         });
 

diff --git a/FE/spot/app/orders/page.tsx b/FE/spot/app/orders/page.tsx
@@ -113,7 +113,7 @@ export default function OrdersPage() {
           <div className="space-y-4">
             {activeOrders.map((order) => (
               <div
-                key={order.id}
+                key={order.orderId}
                 className="bg-white rounded-xl shadow-md p-4 border-l-4 border-orange-500"
               >
                 <div className="flex justify-between items-start mb-3">
@@ -124,9 +124,9 @@ export default function OrdersPage() {
                     </p>
                   </div>
                   <span
-                    className={`px-3 py-1 rounded-full text-sm font-medium ${statusColors[order.orderStatus]}`}
+                    className={`px-3 py-1 rounded-full text-sm font-medium ${statusColors[order.status]}`}
                   >
-                    {statusLabels[order.orderStatus]}
+                    {statusLabels[order.status]}
                   </span>
                 </div>
 
@@ -147,13 +147,13 @@ export default function OrdersPage() {
 
                 <div className="flex justify-between items-center pt-3 border-t">
                   <span className="font-semibold text-orange-500">
-                    {order.totalAmount.toLocaleString()}원
+                    {Number(order.totalAmount ?? 0).toLocaleString()}원
                   </span>
-                  {canCancel(order.orderStatus) && (
+                  {canCancel(order.status) && (
                     <Button
                       variant="outline"
                       size="sm"
-                      onClick={() => handleCancelOrder(order.id)}
+                      onClick={() => handleCancelOrder(order.orderId)}
                     >
                       주문 취소
                     </Button>
@@ -177,16 +177,16 @@ export default function OrdersPage() {
         ) : (
           <div className="space-y-4">
             {orders.map((order) => (
-              <div key={order.id} className="bg-white rounded-xl shadow-md p-4">
+              <div key={order.orderId} className="bg-white rounded-xl shadow-md p-4">
                 <div className="flex justify-between items-start mb-3">
                   <div>
                     <h3 className="font-semibold text-gray-900">{order.storeName}</h3>
                     <p className="text-sm text-gray-500">{formatDate(order.createdAt)}</p>
                   </div>
                   <span
-                    className={`px-3 py-1 rounded-full text-sm font-medium ${statusColors[order.orderStatus]}`}
+                    className={`px-3 py-1 rounded-full text-sm font-medium ${statusColors[order.status]}`}
                   >
-                    {statusLabels[order.orderStatus]}
+                    {statusLabels[order.status]}
                   </span>
                 </div>
 
@@ -207,13 +207,13 @@ export default function OrdersPage() {
 
                 <div className="flex justify-between items-center pt-3 border-t">
                   <span className="font-semibold text-gray-900">
-                    {order.totalAmount.toLocaleString()}원
+                    {Number(order.totalAmount ?? 0).toLocaleString()}원
                   </span>
-                  {canCancel(order.orderStatus) && (
+                  {canCancel(order.status) && (
                     <Button
                       variant="outline"
                       size="sm"
-                      onClick={() => handleCancelOrder(order.id)}
+                      onClick={() => handleCancelOrder(order.orderId)}
                     >
                       주문 취소
                     </Button>

diff --git a/FE/spot/components/order/OrderManagement.tsx b/FE/spot/components/order/OrderManagement.tsx
@@ -185,7 +185,7 @@ export function OrderManagement({ storeId }: OrderManagementProps) {
           </div>
         ) : (
           orders.map((order) => (
-            <div key={order.id} className="bg-white rounded-lg shadow p-6">
+            <div key={order.orderId} className="bg-white rounded-lg shadow p-6">
               {/* 주문 헤더 */}
               <div className="flex items-start justify-between mb-4">
                 <div>
@@ -195,10 +195,10 @@ export function OrderManagement({ storeId }: OrderManagementProps) {
                     </h3>
                     <span
                       className={`px-3 py-1 rounded-full text-xs font-semibold ${
-                        ORDER_STATUS_COLOR[order.orderStatus]
+                        ORDER_STATUS_COLOR[order.status]
                       }`}
                     >
-                      {ORDER_STATUS_KR[order.orderStatus]}
+                      {ORDER_STATUS_KR[order.status]}
                     </span>
                   </div>
                   <div className="text-sm text-gray-600">
@@ -260,42 +260,42 @@ export function OrderManagement({ storeId }: OrderManagementProps) {
 
               {/* 액션 버튼 */}
               <div className="flex gap-2 flex-wrap">
-                {order.orderStatus === 'PENDING' && (
+                {order.status === 'PENDING' && (
                   <>
                     <Button
                       size="sm"
-                      onClick={() => handleAcceptOrder(order.id)}
+                      onClick={() => handleAcceptOrder(order.orderId)}
                     >
                       수락
                     </Button>
                     <Button
                       size="sm"
                       variant="outline"
-                      onClick={() => handleRejectOrder(order.id)}
+                      onClick={() => handleRejectOrder(order.orderId)}
                       className="text-red-600 border-red-600 hover:bg-red-50"
                     >
                       거절
                     </Button>
                   </>
                 )}
 
-                {(order.orderStatus === 'PENDING' ||
-                  order.orderStatus === 'ACCEPTED' ||
-                  order.orderStatus === 'COOKING') && (
+                {(order.status === 'PENDING' ||
+                  order.status === 'ACCEPTED' ||
+                  order.status === 'COOKING') && (
                   <Button
                     size="sm"
                     variant="outline"
-                    onClick={() => setCancelOrderId(order.id)}
+                    onClick={() => setCancelOrderId(order.orderId)}
                     className="text-red-600 border-red-600 hover:bg-red-50"
                   >
                     주문 취소 (고객 요청)
                   </Button>
                 )}
 
-                {order.orderStatus === 'READY' && (
+                {order.status === 'READY' && (
                   <Button
                     size="sm"
-                    onClick={() => handleCompleteOrder(order.id)}
+                    onClick={() => handleCompleteOrder(order.orderId)}
                     className="bg-green-600 hover:bg-green-700"
                   >
                     픽업 완료

diff --git a/FE/spot/lib/admin.ts b/FE/spot/lib/admin.ts
@@ -112,7 +112,7 @@ export const adminStoreApi = {
 export const adminStatsApi = {
   // 전체 통계 조회
   getStats: async (): Promise<AdminStats> => {
-    const response = await api.get<ApiResponse<AdminStats>>('/api/admin/stats');
+    const response = await api.get<ApiResponse<AdminStats>>('/api/admin/stats/dashboard');
     return response.data.result;
   },
 

diff --git a/FE/spot/types/index.ts b/FE/spot/types/index.ts
@@ -133,15 +133,15 @@ export interface OrderCreateRequest {
 }
 
 export interface OrderResponse {
-  id: string;
+  orderId: string;
   userId: number;
   storeId: string;
   storeName: string;
   orderNumber: string;
   needDisposables: boolean;
   request: string;
   pickupTime: string;
-  orderStatus: OrderStatus;
+  status: OrderStatus;
   estimatedTime?: number;
   reason?: string;
   cancelledBy?: string;

diff --git a/k6/scenarios/user/user.js b/k6/scenarios/user/user.js
@@ -116,7 +116,7 @@ export function testAdminGetUsers(accessToken, params = {}) {
 export function testAdminStats(accessToken) {
   const res = http.get(buildUrl(endpoints.user.adminStats), {
     headers: getAuthHeaders(accessToken),
-    tags: { name: 'GET /api/admin/stats' },
+    tags: { name: 'GET /api/admin/stats/dashboard' },
   });
 
   const success = check(res, {

diff --git a/k6/tests/spike.js b/k6/tests/spike.js
@@ -70,7 +70,7 @@ export function setup() {
       // Cache menus for first 3 stores (quick setup for spike test)
       for (let i = 0; i < Math.min(3, stores.length); i++) {
         const store = stores[i];
-        const storeId = store.id || store.storeId;
+        const storeId = store.id || store.id;
 
         const menusRes = http.get(buildUrl(endpoints.store.getMenus(storeId)), {
           headers: getAuthHeaders(customerTokens.accessToken),

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
diff --git a/node_modules/@types/react-dom/LICENSE b/node_modules/@types/react-dom/LICENSE
diff --git a/node_modules/@types/react-dom/README.md b/node_modules/@types/react-dom/README.md