From 509224a68704b170c463809f86cccbef7a5c9af0 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Sun, 23 Feb 2025 17:42:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=8C=85=E8=A3=B9=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/endpoints/order.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 53159d1..95945c3 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -52,10 +52,12 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
             OrderPriceResult: 包含价格信息和使用的优惠券/积分信息
         """
         # 计算所有包裹中的取件码总数
+        package_count = 0
         if price_request.pickup_images:
-            package_count = price_request.package_count
-        else:
-            package_count = sum(
+            package_count += price_request.package_count
+        
+        if price_request.packages:
+            package_count += sum(
                 # 如果package.pickup_codes是空字符串，则取0
                 0 if len(package.pickup_codes.split(',')) == 0 else len(package.pickup_codes.split(','))
                 for package in price_request.packages