Update main.py

main.py

@@ -10,11 +10,10 @@ import json
 import base64
 import hashlib
 import hmac
-import time
 
 app = FastAPI(title="Cié Cié Backend API")
 
-# 🌟 解決 CORS (跨域) 問題：允許您的 GitHub Pages 前端呼叫這台主機
+# 🌟 解決 CORS (跨域) 問題
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"], 
@@ -23,7 +22,7 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# 讀取環境變數 (請在 Hugging Face Settings 中設定)
+# 讀取環境變數 
 SUPABASE_URL = os.getenv("SUPABASE_URL", "")
 SUPABASE_KEY = os.getenv("SUPABASE_KEY", "") # 必須使用 service_role key
 LINE_ACCESS_TOKEN = os.getenv("LINE_ACCESS_TOKEN", "")
@@ -32,15 +31,13 @@ BOSS_LINE_ID = os.getenv("BOSS_LINE_ID", "")
 # 🌟 LINE Pay 金鑰設定 🌟
 LINE_PAY_CHANNEL_ID = os.getenv("LINE_PAY_CHANNEL_ID", "")
 LINE_PAY_CHANNEL_SECRET = os.getenv("LINE_PAY_CHANNEL_SECRET", "")
-LINE_PAY_BASE_URL = "https://sandbox-api-pay.line.me" # 這是沙盒(測試)環境的專屬網址
+LINE_PAY_BASE_URL = "https://sandbox-api-pay.line.me" 
 
-# 結帳完成後要跳轉回哪個網頁？(設定回您的官網)
-RETURN_URL = "https://ciecietaipei.github.io/index.html" 
+# 設定結帳後要跳回前端哪裡？ (指向您的 GitHub Pages booking.html)
+RETURN_URL = "https://ciecietaipei.github.io/booking.html" 
 
-# 初始化 Supabase
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY) if SUPABASE_URL else None
 
-# 定義前端傳來的資料結構 (Payload)
 class OrderPayload(BaseModel):
     service_type: str
     name: str
@@ -53,6 +50,11 @@ class OrderPayload(BaseModel):
     deposit_required: int = 0
     total_amount: int = 0
 
+class ConfirmPayload(BaseModel):
+    transaction_id: str
+    order_id: str
+    amount: int
+
 @app.get("/")
 def read_root():
     return {"status": "online", "message": "Cié Cié FastAPI is running."}
@@ -62,71 +64,40 @@ async def submit_booking(payload: OrderPayload):
     if not supabase:
         raise HTTPException(status_code=500, detail="資料庫未設定")
 
-    # ==========================================
-    # 🕵️‍♂️ 階段 1：查核 No-Show 黑名單
-    # ==========================================
     is_noshow = False
     try:
-        # 用電話號碼去資料庫找有沒有 No-Show 紀錄
         res = supabase.table("bookings").select("id").eq("tel", payload.tel).eq("status", "No-Show").execute()
         is_noshow = len(res.data) > 0
-    except Exception as e:
-        print("查詢黑名單失敗:", e)
+    except: pass
 
-    # 決定最終訂金：如果是黑名單，原本不用付訂金的也強制收 $1000
     final_deposit = payload.deposit_required
     if is_noshow and final_deposit == 0:
         final_deposit = 1000
 
-    # ==========================================
-    # 💳 階段 2：金流分流處理 (需要收訂金 vs 不用收訂金)
-    # ==========================================
-    
-    # 狀況 A：需要付款 (產生真實 LINE Pay 連結)
     if final_deposit > 0:
         order_id = f"ORDER-{uuid.uuid4().hex[:8].upper()}"
         
-        # 1. 準備發送給 LINE Pay 的訂單資料 (JSON)
         request_body = {
             "amount": final_deposit,
             "currency": "TWD",
             "orderId": order_id,
-            "packages": [
-                {
-                    "id": "pkg_1",
-                    "amount": final_deposit,
-                    "name": "Cié Cié Taipei 預約/點餐",
-                    "products": [
-                        {
-                            "name": "餐飲訂金與預付金",
-                            "quantity": 1,
-                            "price": final_deposit
-                        }
-                    ]
-                }
-            ],
+            "packages": [{
+                "id": "pkg_1", "amount": final_deposit, "name": "Cié Cié Taipei 預付金",
+                "products": [{"name": "餐飲訂金與預付金", "quantity": 1, "price": final_deposit}]
+            }],
             "redirectUrls": {
-                "confirmUrl": RETURN_URL, # 客人付款完，LINE Pay 會把他導回您的首頁
-                "cancelUrl": RETURN_URL
+                # 這裡最關鍵：帶上 action=payment_confirm 讓前端知道要處理結帳確認
+                "confirmUrl": f"{RETURN_URL}?action=payment_confirm&amount={final_deposit}", 
+                "cancelUrl": f"{RETURN_URL}?action=payment_cancel"
             }
         }
         
-        # 2. 核心大魔王：生成 HMAC-SHA256 簽章
         uri = "/v3/payments/request"
         nonce = str(uuid.uuid4())
         body_str = json.dumps(request_body)
         message = LINE_PAY_CHANNEL_SECRET + uri + body_str + nonce
-        
-        # 執行加密
-        signature = base64.b64encode(
-            hmac.new(
-                LINE_PAY_CHANNEL_SECRET.encode(), 
-                message.encode(), 
-                hashlib.sha256
-            ).digest()
-        ).decode()
-
-        # 3. 發送請求給 LINE Pay 總部
+        signature = base64.b64encode(hmac.new(LINE_PAY_CHANNEL_SECRET.encode(), message.encode(), hashlib.sha256).digest()).decode()
+
         headers = {
             "Content-Type": "application/json",
             "X-LINE-ChannelId": LINE_PAY_CHANNEL_ID,
@@ -135,69 +106,78 @@ async def submit_booking(payload: OrderPayload):
         }
         
         try:
-            line_pay_res = requests.post(
-                f"{LINE_PAY_BASE_URL}{uri}",
-                headers=headers,
-                data=body_str
-            )
+            line_pay_res = requests.post(f"{LINE_PAY_BASE_URL}{uri}", headers=headers, data=body_str)
             res_data = line_pay_res.json()
             
-            # 如果 LINE Pay 成功受理，它會回傳一組專屬網址給我們
             if res_data.get("returnCode") == "0000":
                 payment_url = res_data["info"]["paymentUrl"]["web"]
-                
-                # 這裡我們先把訂單狀態記為 "待付款"，寫入資料庫
                 booking_data = {
                     "name": payload.name, "tel": payload.tel, "date": payload.date, 
                     "time": payload.time, "pax": payload.pax, "user_id": payload.line_id,
-                    "status": "待付款", # 特別標記為待付款
+                    "status": "待付款", 
                     "remarks": f"類型: {'外帶' if payload.service_type == 'takeout' else '內用'}\n餐點: {payload.cart}\n訂單號: {order_id}"
                 }
                 supabase.table("bookings").insert(booking_data).execute()
 
                 return {
-                    "status": "require_payment",
-                    "message": "訂單需支付訂金",
-                    "is_noshow_penalty": is_noshow,
-                    "deposit_amount": final_deposit,
-                    "payment_url": payment_url, # 這是真實會跳轉去刷卡的網址！
-                    "order_id": order_id
+                    "status": "require_payment", "message": "訂單需支付訂金",
+                    "is_noshow_penalty": is_noshow, "deposit_amount": final_deposit,
+                    "payment_url": payment_url, "order_id": order_id
                 }
-            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)}")
+            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)}")
 
-    # 狀況 B：不需付款 (直接寫入資料庫並完成訂位)
     booking_data = {
-        "name": payload.name,
-        "tel": payload.tel,
-        "date": payload.date,
-        "time": payload.time,
-        "pax": payload.pax,
-        "email": "", 
-        "user_id": payload.line_id,
-        "status": "待處理",
+        "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餐點: {payload.cart}"
     }
     
     try:
         supabase.table("bookings").insert(booking_data).execute()
-        # 🔔 通知老闆有新訂位
-        notify_boss(payload.name, payload.tel, payload.date, payload.time, payload.pax)
+        notify_boss(payload.name, payload.tel, payload.date, payload.time, payload.pax, 0)
         return { "status": "success", "message": "訂位已成功建立！" }
+    except Exception as e: raise HTTPException(status_code=500, detail=f"寫入資料庫失敗: {str(e)}")
+
+# 🌟 新增：確認收錢的端點 (Confirm API) 🌟
+@app.post("/api/linepay/confirm")
+async def confirm_payment(payload: ConfirmPayload):
+    uri = f"/v3/payments/{payload.transaction_id}/confirm"
+    nonce = str(uuid.uuid4())
+    body_str = json.dumps({"amount": payload.amount, "currency": "TWD"})
+    message = LINE_PAY_CHANNEL_SECRET + uri + body_str + nonce
+    signature = base64.b64encode(hmac.new(LINE_PAY_CHANNEL_SECRET.encode(), message.encode(), hashlib.sha256).digest()).decode()
+
+    headers = {
+        "Content-Type": "application/json", "X-LINE-ChannelId": LINE_PAY_CHANNEL_ID,
+        "X-LINE-Authorization-Nonce": nonce, "X-LINE-Authorization": signature
+    }
+
+    try:
+        res = requests.post(f"{LINE_PAY_BASE_URL}{uri}", headers=headers, data=body_str)
+        res_data = res.json()
+
+        if res_data.get("returnCode") == "0000":
+            # 1. 更新資料庫狀態為已付款
+            update_res = supabase.table("bookings").update({"status": "待處理 (已付訂金)"}).ilike("remarks", f"%{payload.order_id}%").execute()
+            
+            # 2. 發送通知給老闆
+            if update_res.data:
+                b = update_res.data[0]
+                notify_boss(b['name'], b['tel'], b['date'], b['time'], b['pax'], payload.amount)
+
+            return {"status": "success", "message": "付款確認成功"}
+        else:
+            raise HTTPException(status_code=400, detail=res_data.get('returnMessage'))
     except Exception as e:
-        raise HTTPException(status_code=500, detail=f"寫入資料庫失敗: {str(e)}")
+        raise HTTPException(status_code=500, detail=str(e))
 
-def notify_boss(name, tel, date, time, pax):
-    """發送 LINE 通知給老闆"""
-    if not LINE_ACCESS_TOKEN or not BOSS_LINE_ID:
-        return
-    msg = f"🔔 【新訂位通知】\n姓名：{name}\n電話：{tel}\n時間：{date} {time}\n人數：{pax}位"
+def notify_boss(name, tel, date, time, pax, amount):
+    if not LINE_ACCESS_TOKEN or not BOSS_LINE_ID: return
+    msg = f"🔔 【新訂單通知】\n姓名：{name}\n電話：{tel}\n時間：{date} {time}\n人數：{pax}位"
+    if amount > 0: msg += f"\n💰 已收到線上付款：${amount}"
+    
     headers = {"Authorization": f"Bearer {LINE_ACCESS_TOKEN}"}
     payload = {"to": BOSS_LINE_ID, "messages": [{"type": "text", "text": msg}]}
-    try:
-        requests.post("https://api.line.me/v2/bot/message/push", headers=headers, json=payload)
-    except:
-        pass
+    try: requests.post("https://api.line.me/v2/bot/message/push", headers=headers, json=payload)
+    except: pass