Update main.py

main.py

@@ -53,7 +53,10 @@ class OrderPayload(BaseModel):
     cart: Dict[str, int] = {}
     deposit_required: int = 0
     total_amount: int = 0
-    kitchen_remarks: Optional[str] = "" # 🌟 新增這行，用來接收前端組合好的餐點明細
+    kitchen_remarks: Optional[str] = "" 
+    # 🚀 【關鍵修正 1】讓後端海關允許接收前端傳過來的 email 與 remarks
+    email: Optional[str] = ""
+    remarks: Optional[str] = ""
     
 class ConfirmPayload(BaseModel):
     transaction_id: str
@@ -187,11 +190,14 @@ async def submit_booking(payload: OrderPayload, background_tasks: BackgroundTask
             
             if res_data.get("returnCode") == "0000":
                 payment_url = res_data["info"]["paymentUrl"]["web"]
+                
+                # 🚀 【關鍵修正 2】有付訂金時，確實寫入 email 並將客人備註融入大 remarks 中
                 booking_data = {
                     "name": payload.name, "tel": payload.tel, "date": payload.date, 
                     "time": payload.time, "pax": payload.pax, "user_id": payload.line_id,
+                    "email": payload.email,
                     "status": "待付款", 
-                    "remarks": f"類型: {'外帶' if payload.service_type == 'takeout' else '內用'}\n訂單號: {order_id}\n\n{payload.kitchen_remarks}"
+                    "remarks": f"類型: {'外帶' if payload.service_type == 'takeout' else '內用'}\n訂單號: {order_id}\n客人備註: {payload.remarks if payload.remarks else '無'}\n\n{payload.kitchen_remarks}"
                 }
                 supabase.table("bookings").insert(booking_data).execute()
 
@@ -206,10 +212,14 @@ async def submit_booking(payload: OrderPayload, background_tasks: BackgroundTask
             else: raise HTTPException(status_code=500, detail=f"LINE Pay 錯誤: {res_data.get('returnMessage')}")
         except Exception as e: raise HTTPException(status_code=500, detail=f"金流連線失敗: {str(e)}")
 
+    # 🚀 【關鍵修正 3】免付訂金時，將寫死的 "" 改為寫入 payload.email，並融入客人備註
     booking_data = {
         "name": payload.name, "tel": payload.tel, "date": payload.date, "time": payload.time,
-        "pax": payload.pax, "email": "", "user_id": payload.line_id, "status": "待處理",
-        "remarks": f"類型: {'外帶' if payload.service_type == 'takeout' else '內用'}\n\n{payload.kitchen_remarks}"
+        "pax": payload.pax, 
+        "email": payload.email, 
+        "user_id": payload.line_id, 
+        "status": "待處理",
+        "remarks": f"類型: {'外帶' if payload.service_type == 'takeout' else '內用'}\n客人備註: {payload.remarks if payload.remarks else '無'}\n\n{payload.kitchen_remarks}"
     }
     
     try:
@@ -262,8 +272,7 @@ async def repay_payment(payload: RepayPayload):
         if "已付" in booking.get("status", "") or "確認" in booking.get("status", ""):
             raise HTTPException(status_code=400, detail="此訂單已完成付款或確認，無需重新結帳")
 
-        # 🌟 修改：向 LINE Pay 查詢最初應付的正確金額，避免外帶單只收 1000 元 🌟
-        amount = 1000 # 預設防護底線
+        amount = 1000 
         try:
             chk_uri = "/v3/payments"
             chk_query = urllib.parse.urlencode({"orderId": payload.order_id})
@@ -273,7 +282,6 @@ async def repay_payment(payload: RepayPayload):
             chk_headers = { "Content-Type": "application/json", "X-LINE-ChannelId": LINE_PAY_CHANNEL_ID, "X-LINE-Authorization-Nonce": chk_nonce, "X-LINE-Authorization": chk_sig }
             chk_res = requests.get(f"{LINE_PAY_BASE_URL}{chk_uri}?{chk_query}", headers=chk_headers).json()
             if chk_res.get("returnCode") == "0000" and chk_res.get("info"):
-                # 成功抓出這筆訂單原本設定的金額！
                 amount = chk_res["info"][0].get("payInfo", [{}])[0].get("amount", 1000)
         except Exception as e:
             print(f"無法取得原始金額，使用預設值: {e}")
@@ -326,23 +334,17 @@ def notify_boss(name, tel, date, time, pax, amount):
     try: requests.post("https://api.line.me/v2/bot/message/push", headers=headers, json=payload)
     except: pass
 
-# ==========================================
-# 🌟 計算某日庫存與銷量的 API (防護升級版) 🌟
-# ==========================================
 @app.get("/api/inventory/{query_date}")
 async def get_inventory(query_date: str):
     if not supabase: return {}
     try:
-        # 找出這天所有的訂單
         res = supabase.table("bookings").select("cart, status").eq("date", query_date).execute()
         sold_counts = {}
         if res.data:
             for b in res.data:
-                # 排除已經取消或 No-Show 的訂單，把扣打還給庫存
                 if "取消" in b.get("status", "") or "No-Show" in b.get("status", ""):
                     continue
                 
-                # 🌟 修改：加入型別檢查防護，避免 null 或 字串 引發當機
                 cart = b.get("cart")
                 if not cart:
                     cart = {}
@@ -350,7 +352,6 @@ async def get_inventory(query_date: str):
                     try: cart = json.loads(cart)
                     except: cart = {}
                 
-                # 計算這筆訂單買了什麼
                 for item_id, qty in cart.items():
                     try: qty = int(qty)
                     except: qty = 0