From a9a381fedd94280a4030989bde4c70931053a875 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 23 Jan 2025 21:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E4=BC=A0=E5=85=A5=E5=8F=82=E6=95=B0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/endpoints/wechat.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/api/endpoints/wechat.py b/app/api/endpoints/wechat.py
index fd1b998..cc8c026 100644
--- a/app/api/endpoints/wechat.py
+++ b/app/api/endpoints/wechat.py
@@ -16,6 +16,7 @@ import random
 import string
 from app.models.merchant_order import MerchantOrderDB, MerchantOrderStatus
 from app.models.merchant_pay_order import MerchantPayOrderDB, MerchantPayOrderStatus
+import enum
 
 router = APIRouter()
 
@@ -24,10 +25,15 @@ class PhoneNumberRequest(BaseModel):
     phone_code: str  # 手机号验证码
     referral_code: str = None  # 推荐码（可选）
 
+class OrderType(str, enum.Enum):
+    DELIVERY = "DELIVERY"       # 配送订单
+    PRODUCT = "PRODUCT"        # 商品订单
+    ONLINE_PAY = "ONLINE_PAY"  # 在线支付
+
 class WechatPayRequest(BaseModel):
     """微信支付请求"""
     order_id: str
-    order_type: str = Field(..., description="订单类型: merchant_order/merchant_pay_order")
+    order_type: OrderType = Field(..., description="订单类型")
 
 @router.post("/phone-login", response_model=ResponseModel)
 async def wechat_phone_login(
@@ -113,7 +119,7 @@ async def create_payment(
 ):
     """创建微信支付订单"""
     # 查询订单
-    if request.order_type == "merchant_order":
+    if request.order_type == OrderType.PRODUCT:
         order = db.query(MerchantOrderDB).filter(
             MerchantOrderDB.order_id == request.order_id,
             MerchantOrderDB.user_id == current_user.userid,
@@ -124,7 +130,7 @@ async def create_payment(
         amount = order.pay_amount
         description = "商家商品订单"
         
-    elif request.order_type == "merchant_pay_order":
+    elif request.order_type == OrderType.ONLINE_PAY:
         order = db.query(MerchantPayOrderDB).filter(
             MerchantPayOrderDB.order_id == request.order_id,
             MerchantPayOrderDB.user_id == current_user.userid,