From 97d2092137cf95b6a5fef68a225462d0e1b2b09c Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 13 Feb 2025 11:32:09 +0800
Subject: [PATCH] update

---
 app/api/endpoints/order.py | 8 +++-----
 app/models/order.py        | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 24338df..9330ac5 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -57,7 +57,8 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
                 coupon_discount_amount=0,
                 points_discount_amount=0,
                 final_amount=settings.ORDER_BASE_PRICE
-            )
+            ),
+            price_detail_text=settings.ORDER_PREORDER_PRICE_TEXT
         )
         
         original_amount = settings.ORDER_BASE_PRICE
@@ -122,10 +123,7 @@ async def pre_order(
 
     """预下单 - 计算价格"""
     price_info = calculate_price(request, current_user, db)
-    return success_response(data={
-        "price_info": price_info,
-        "price_detail_text" : settings.ORDER_PREORDER_PRICE_TEXT
-    })
+    return success_response(data=price_info)
 
 @router.post("", response_model=ResponseModel)
 async def create_shipping_order(
diff --git a/app/models/order.py b/app/models/order.py
index b493dc2..6714015 100644
--- a/app/models/order.py
+++ b/app/models/order.py
@@ -140,4 +140,5 @@ class OrderPriceResult(BaseModel):
     """订单价格计算结果"""
     price_info: OrderPriceInfo
     used_coupon_id: Optional[int] = None  # 使用的优惠券ID
-    used_points: Optional[int] = None     # 使用的积分数 
\ No newline at end of file
+    used_points: Optional[int] = None     # 使用的积分数 
+    price_detail_text: Optional[str] = None  # 价格详情文本
\ No newline at end of file