This commit is contained in:
aaron 2025-02-12 21:03:47 +08:00
parent e6ab6a7558
commit 8b5a5988e3
6 changed files with 22 additions and 8 deletions

View File

@ -11,7 +11,7 @@ from app.core.response import success_response, error_response, ResponseModel
router = APIRouter() router = APIRouter()
@router.post("/", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_address( async def create_address(
address: AddressCreate, address: AddressCreate,
db: Session = Depends(get_db), db: Session = Depends(get_db),
@ -35,7 +35,7 @@ async def create_address(
db.refresh(db_address) db.refresh(db_address)
return success_response(data=AddressInfo.model_validate(db_address)) return success_response(data=AddressInfo.model_validate(db_address))
@router.get("/", response_model=ResponseModel) @router.get("", response_model=ResponseModel)
async def get_addresses( async def get_addresses(
community_id: Optional[int] = None, community_id: Optional[int] = None,
db: Session = Depends(get_db), db: Session = Depends(get_db),

View File

@ -12,7 +12,7 @@ from app.core.response import success_response, error_response, ResponseModel
router = APIRouter() router = APIRouter()
@router.post("/", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_community( async def create_community(
community: CommunityCreate, community: CommunityCreate,
db: Session = Depends(get_db), db: Session = Depends(get_db),

View File

@ -19,7 +19,7 @@ from datetime import datetime, timezone
router = APIRouter() router = APIRouter()
@router.post("/", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_coupon( async def create_coupon(
coupon: CouponCreate, coupon: CouponCreate,
db: Session = Depends(get_db), db: Session = Depends(get_db),

View File

@ -113,7 +113,7 @@ async def pre_order(
price_info = calculate_price(request, current_user, db) price_info = calculate_price(request, current_user, db)
return success_response(data=price_info) return success_response(data=price_info)
@router.post("/", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_shipping_order( async def create_shipping_order(
order: OrderCreate, order: OrderCreate,
db: Session = Depends(get_db), db: Session = Depends(get_db),

View File

@ -10,7 +10,7 @@ from app.core.response import success_response, error_response, ResponseModel
router = APIRouter() router = APIRouter()
@router.post("/", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_station( async def create_station(
station: StationCreate, station: StationCreate,
db: Session = Depends(get_db), db: Session = Depends(get_db),
@ -23,7 +23,7 @@ async def create_station(
db.refresh(db_station) db.refresh(db_station)
return success_response(data=StationInfo.model_validate(db_station)) return success_response(data=StationInfo.model_validate(db_station))
@router.get("/", response_model=ResponseModel) @router.get("", response_model=ResponseModel)
async def get_stations( async def get_stations(
community_id: Optional[int] = None, community_id: Optional[int] = None,
skip: int = 0, skip: int = 0,

View File

@ -22,6 +22,7 @@ from app.models.community import CommunityDB
from app.models.user_auth import UserAuthDB, UserAuthCreate, UserAuthInfo from app.models.user_auth import UserAuthDB, UserAuthCreate, UserAuthInfo
from app.core.qcloud import qcloud_manager from app.core.qcloud import qcloud_manager
from app.models.merchant import MerchantDB from app.models.merchant import MerchantDB
from app.models.address import AddressDB, AddressInfo
router = APIRouter() router = APIRouter()
@ -127,10 +128,23 @@ async def get_user_info(
# 获取用户基本信息 # 获取用户基本信息
user_info = UserInfo.model_validate(current_user) user_info = UserInfo.model_validate(current_user)
# 返回用户的默认地址,需要 join 出社区名称
default_address = db.query(AddressDB, CommunityDB.name.label('community_name')).join(
CommunityDB,
AddressDB.community_id == CommunityDB.id
).filter(
AddressDB.user_id == current_user.userid,
AddressDB.is_default == True
).first()
if default_address:
user_info = AddressInfo.model_validate(default_address)
return success_response(data={ return success_response(data={
**user_info.model_dump(), **user_info.model_dump(),
"coupon_count": coupon_count "coupon_count": coupon_count,
"default_address": default_address
}) })
@router.post("/phone-login", response_model=ResponseModel) @router.post("/phone-login", response_model=ResponseModel)