From 34f7c2b9c09d95fdf63b5fe8026b47429b5caef5 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 24 Feb 2025 22:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=8F=96=E4=BB=B6=E7=A0=81=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E6=8E=92=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index 9b6457b..ceaaefd 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -248,12 +248,15 @@ async def create_order(
                 station = db.query(StationDB).filter(
                     StationDB.id == package.station_id
                 ).first()
+                
+                # 对package.pickup_codes中分割的取件码，进行排序
+                sorted_pickup_codes = sorted(package.pickup_codes.split(","), key=lambda x: int(x.split("-")[0]))
 
                 db_package = ShippingOrderPackageDB(
                     orderid=orderid,
                     station_id=package.station_id,
                     station_name=station.name,
-                    pickup_codes=package.pickup_codes
+                    pickup_codes=','.join(sorted_pickup_codes)
                 )
                 db.add(db_package)
     
diff --git a/app/models/order.py b/app/models/order.py
index b543908..117bc90 100644
--- a/app/models/order.py
+++ b/app/models/order.py
@@ -52,7 +52,7 @@ class ShippingOrderDB(Base):
     address_detail = Column(String(100), nullable=False, default='')  # 详细地址快照
 
     # 取件图片
-    pickup_images = Column(String(1000), nullable=True)  # 取件图片URL，多个URL用逗号分隔
+    pickup_images = Column(String(2000), nullable=True)  # 取件图片URL，多个URL用逗号分隔
     pickup_images_count = Column(Integer, nullable=False, default=0)  # 取件图片数量
 
     pickup_code_count = Column(Integer, nullable=False, default=0)  # 取件码数量