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 7042328..ef7a342 100644 Binary files a/jobs.sqlite and b/jobs.sqlite differ