From 8a11199584664d9a2650cb89d31ac62599da07de Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Tue, 25 Mar 2025 14:30:15 +0800
Subject: [PATCH] update

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

diff --git a/app/api/endpoints/merchant_product.py b/app/api/endpoints/merchant_product.py
index d8f6d6b..da8730f 100644
--- a/app/api/endpoints/merchant_product.py
+++ b/app/api/endpoints/merchant_product.py
@@ -16,7 +16,7 @@ from sqlalchemy import func
 from sqlalchemy.orm import joinedload
 from app.models.merchant_product import OperationType, DeliveryType, DeliveryTimeType
 from app.models.merchant import MerchantInfo
-from app.models.address import AddressDB, AddressInfo
+from app.models.address import AddressDB, AddressInfo, AddressType
 from app.api.deps import get_current_user
 
 router = APIRouter()
@@ -148,7 +148,8 @@ async def get_product(
     # 获取默认地址
     default_address = db.query(AddressDB).filter(
         AddressDB.user_id == current_user.userid,
-        AddressDB.is_default == True
+        AddressDB.is_default == True,
+        AddressDB.address_type == AddressType.COMMON
     ).first()
 
     if default_address:
diff --git a/jobs.sqlite b/jobs.sqlite
index 7042328f7bf64b3f00ea0401ea918e654e15bbea..ef7a342ae43b053b5043fcbaddc28046ab338dd1 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_2s>qHr6#@3Aq3*rGtGY2{V

delta 19
acmZoTz}Rqrae_2s^F$eE#^#L)3*rGt6$dr|