From 46d750d15f62f4ae8ccebcb2deddf62985780c8c Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Fri, 14 Mar 2025 00:01:19 +0800
Subject: [PATCH] upodate

---
 app/api/endpoints/order.py |  10 +++++-----
 app/models/order.py        |   2 +-
 jobs.sqlite                | Bin 24576 -> 24576 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 04d18d0..a26bd50 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -86,7 +86,7 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
                 coupon_discount_amount=0,
                 points_discount_amount=0,
                 original_amount=0,
-                base_delivery_price=0,
+                base_delivery_amount=0,
                 more_station_price=0,
                 final_amount=0
             )
@@ -109,8 +109,8 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
 
         # 是否有多驿站
         more_station_price = float(community.more_station_price) * (len(price_request.packages) - 1) if len(price_request.packages) > 1 else 0
-        base_delivery_price = round(base_price + extra_package_price * max(0, package_count - extra_package_threshold), 2)
-        original_amount = round(more_station_price + base_delivery_price, 2)
+        base_delivery_amount = round(base_price + extra_package_price * max(0, package_count - extra_package_threshold), 2)
+        original_amount = round(more_station_price + base_delivery_amount, 2)
         
         result.price_info.package_count = package_count
         result.price_info.pickup_images_count = pickup_images_count
@@ -118,7 +118,7 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
         result.price_info.original_amount = original_amount
         result.price_info.more_station_price = more_station_price
         result.price_info.final_amount = original_amount
-        result.price_info.base_delivery_price = base_delivery_price
+        result.price_info.base_delivery_amount = base_delivery_amount
         
         remaining_amount = original_amount
         
@@ -511,7 +511,7 @@ async def get_order_detail(
         "pickup_code_count": order.pickup_code_count,
         "pickup_images_count": order.pickup_images_count,
         "original_amount": order.original_amount,
-        "base_delivery_price": order.original_amount - order.more_station_price,
+        "base_delivery_amount": order.original_amount - order.more_station_price,
         "coupon_discount_amount": order.coupon_discount_amount,
         "point_discount_amount": order.point_discount_amount,
         "more_station_price": order.more_station_price,
diff --git a/app/models/order.py b/app/models/order.py
index 787f061..12b6dd6 100644
--- a/app/models/order.py
+++ b/app/models/order.py
@@ -223,7 +223,7 @@ class OrderPriceInfo(BaseModel):
     coupon_discount_amount: float = 0
     points_discount_amount: float = 0
     more_station_price: float = 0
-    base_delivery_price: float = 0
+    base_delivery_amount: float = 0
     coupon_id: Optional[int] = None
     final_amount: float = 0
 
diff --git a/jobs.sqlite b/jobs.sqlite
index a12181d7ea771b5ce07a9ba243d19eaeb5154dea..cdd5a258b96aec8ff6acbdb672c8d4b7ad3da65d 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_1>`$QRMM)r*f3*rGl(FQ&M

delta 19
acmZoTz}Rqrae_1><3t%}M#hZ^3*rGlcLp*5