diff --git a/app/api/endpoints/partner.py b/app/api/endpoints/partner.py index 6dd6a5d..96e4c59 100644 --- a/app/api/endpoints/partner.py +++ b/app/api/endpoints/partner.py @@ -27,14 +27,15 @@ async def partner_summary( """获取合伙人收益汇总""" # 获取当前用户管理的小区ID列表,直接在数据库层面去重 - community_ids = db.query(CommunitySetMapping.community_id)\ + query_result = db.query(CommunitySetMapping.community_id, CommunitySet.set_name)\ .join(CommunitySet, CommunitySetMapping.set_id == CommunitySet.id)\ .filter(CommunitySet.user_id == current_user.userid)\ .distinct()\ .all() # 将结果转换为简单列表 - community_ids = [community_id[0] for community_id in community_ids] + community_ids = [community_id[0] for community_id in query_result] + set_names = list(set([community_id[1] for community_id in query_result])) # 总订单数 total_order_count = db.query(ShippingOrderDB).filter( @@ -84,7 +85,8 @@ async def partner_summary( ).scalar() return success_response(data= - {"community_count": len(community_ids), + {"set_names": "|".join(set_names), + "community_count": len(community_ids), "total_order_count": total_order_count, "today_order_count": today_order_count, "yesterday_order_count": yesterday_order_count, diff --git a/jobs.sqlite b/jobs.sqlite index 276e738..97e6fab 100644 Binary files a/jobs.sqlite and b/jobs.sqlite differ