增加是否订阅消息的返回

This commit is contained in:
aaron 2025-02-14 15:54:43 +08:00
parent 6862a7f660
commit 31fc4b88f3
2 changed files with 15 additions and 7 deletions

View File

@ -66,4 +66,4 @@ async def get_subscribes(
return success_response(data=[ return success_response(data=[
SubscribeInfo.model_validate(s) for s in subscribes SubscribeInfo.model_validate(s) for s in subscribes
]) ])

View File

@ -23,7 +23,7 @@ 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 from app.models.address import AddressDB, AddressInfo
from app.models.subscribe import SubscribeDB
router = APIRouter() router = APIRouter()
# Redis 连接 # Redis 连接
@ -120,11 +120,7 @@ async def get_user_info(
current_user: UserDB = Depends(get_current_user) current_user: UserDB = Depends(get_current_user)
): ):
"""获取用户信息""" """获取用户信息"""
# 查询用户未使用的优惠券数量
coupon_count = db.query(UserCouponDB).filter(
UserCouponDB.user_id == current_user.userid,
UserCouponDB.status == CouponStatus.UNUSED
).count()
# 获取用户默认地址 # 获取用户默认地址
default_address = db.query(AddressDB, CommunityDB.name.label('community_name')).join( default_address = db.query(AddressDB, CommunityDB.name.label('community_name')).join(
@ -155,7 +151,19 @@ async def get_user_info(
} }
user_data['default_address'] = AddressInfo(**address_data) user_data['default_address'] = AddressInfo(**address_data)
# 查询用户未使用的优惠券数量
coupon_count = db.query(UserCouponDB).filter(
UserCouponDB.user_id == current_user.userid,
UserCouponDB.status == CouponStatus.UNUSED
).count()
user_data['coupon_count'] = coupon_count user_data['coupon_count'] = coupon_count
# 查询当前用户是否订阅的模板
subscribe_count = db.query(SubscribeDB).filter(
SubscribeDB.user_id == current_user.userid
).count()
user_data['is_subscribe'] = subscribe_count > 0
return success_response(data=user_data) return success_response(data=user_data)