From faeb44b43f3a0dbba1f2a03b19065f1e4657f469 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Tue, 25 Mar 2025 12:42:59 +0800
Subject: [PATCH] update

---
 app/api/endpoints/address.py |  32 +++++++++++++++++++-------------
 app/sql/v1.1.sql             |   5 ++++-
 jobs.sqlite                  | Bin 24576 -> 24576 bytes
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/api/endpoints/address.py b/app/api/endpoints/address.py
index c395884..8048754 100644
--- a/app/api/endpoints/address.py
+++ b/app/api/endpoints/address.py
@@ -28,20 +28,26 @@ async def create_address(
         ).update({"is_default": False})
     
     # 查询社区名字和楼栋名字
-    community = db.query(CommunityDB).filter(
-        CommunityDB.id == address.community_id
-    ).first()
+    if address.community_id:
+        community = db.query(CommunityDB).filter(
+            CommunityDB.id == address.community_id
+        ).first()
     
-    community_building = db.query(CommunityBuildingDB).filter(
-        CommunityBuildingDB.id == address.community_building_id
-    ).first()
-
-    db_address = AddressDB(
-        user_id=current_user.userid,
-        community_name=community.name,
-        community_building_name=community_building.building_name,
-        **address.model_dump()
-    )
+        community_building = db.query(CommunityBuildingDB).filter(
+            CommunityBuildingDB.id == address.community_building_id
+        ).first()
+    
+        db_address = AddressDB(
+            user_id=current_user.userid,
+            community_name=community.name,
+            community_building_name=community_building.building_name,
+            **address.model_dump()
+        )
+    else:
+        db_address = AddressDB(
+            user_id=current_user.userid,
+            **address.model_dump()
+        )
 
     db.add(db_address)
     db.commit()
diff --git a/app/sql/v1.1.sql b/app/sql/v1.1.sql
index e7c4eda..526e08d 100644
--- a/app/sql/v1.1.sql
+++ b/app/sql/v1.1.sql
@@ -159,4 +159,7 @@ ADD COLUMN product_delivery_deadline_time DATETIME COMMENT '配送截止时间
 ALTER TABLE merchants 
 ADD COLUMN community_id INT COMMENT '所属小区' AFTER user_id,
 ADD CONSTRAINT fk_merchant_community 
-FOREIGN KEY (community_id) REFERENCES communities(id)
\ No newline at end of file
+FOREIGN KEY (community_id) REFERENCES communities(id)
+
+
+--====FINISH 3.24====
\ No newline at end of file
diff --git a/jobs.sqlite b/jobs.sqlite
index 37a0aa99b183b6312c48fbc9c07d350f936c4aa4..acc281bfb9f144fcf973b0f3de84559f27a9e626 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_2s^h6nF#^{X+3*rGqy$0q0

delta 19
acmZoTz}Rqrae_2s;6xc`#=wmU3*rGqCkE00