fix(huya): 协作台账固定序号并支持表头排序
This commit is contained in:
@@ -221,6 +221,8 @@ def list_external_orders(
|
||||
gift_name: str = Query("", max_length=128),
|
||||
keyword: str = Query("", max_length=128),
|
||||
include_void: bool = Query(False, description="是否包含已作废的行(默认隐藏)"),
|
||||
sort_by: str = Query("seq", max_length=32, description="排序字段(白名单)"),
|
||||
sort_order: str = Query("asc", max_length=8, description="asc / desc"),
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(50, ge=1, le=200),
|
||||
db: Session = Depends(get_db),
|
||||
@@ -236,6 +238,8 @@ def list_external_orders(
|
||||
gift_name=gift_name,
|
||||
keyword=keyword,
|
||||
include_void=include_void,
|
||||
sort_by=sort_by,
|
||||
sort_order=sort_order,
|
||||
page=page,
|
||||
page_size=page_size,
|
||||
)
|
||||
|
||||
@@ -2308,6 +2308,21 @@ def get_order(db: Session, order_id: int) -> HuyaExternalOrder:
|
||||
return order
|
||||
|
||||
|
||||
ORDER_SORT_KEYS: tuple[str, ...] = (
|
||||
"seq",
|
||||
"order_no",
|
||||
"shop",
|
||||
"owner",
|
||||
"bind",
|
||||
"gift_name",
|
||||
"status",
|
||||
"uid",
|
||||
"ck_status",
|
||||
"updated_at",
|
||||
"created_at",
|
||||
)
|
||||
|
||||
|
||||
def list_orders(
|
||||
db: Session,
|
||||
*,
|
||||
@@ -2318,10 +2333,15 @@ def list_orders(
|
||||
gift_name: str = "",
|
||||
keyword: str = "",
|
||||
include_void: bool = False,
|
||||
sort_by: str = "seq",
|
||||
sort_order: str = "asc",
|
||||
page: int = 1,
|
||||
page_size: int = 50,
|
||||
) -> tuple[list[HuyaExternalOrder], int]:
|
||||
"""共享视图:默认**不按人过滤**(负责人只是筛选维度,不是权限边界)。"""
|
||||
"""共享视图:默认**不按人过滤**(负责人只是筛选维度,不是权限边界)。
|
||||
|
||||
默认按 ``id`` 升序(即创建顺序),新建的行永远追加在最后;表头排序走白名单,
|
||||
不允许前端把任意列名拼进 SQL。"""
|
||||
query = db.query(HuyaExternalOrder)
|
||||
if shop:
|
||||
query = query.filter(HuyaExternalOrder.shop == shop)
|
||||
@@ -2358,10 +2378,29 @@ def list_orders(
|
||||
total = query.count()
|
||||
page = max(1, int(page or 1))
|
||||
page_size = min(200, max(1, int(page_size or 50)))
|
||||
# 排序:业务状态(作废排最后)+ 最近改动在前,让「刚被谁动过」的浮上来。
|
||||
stage = func.field(HuyaExternalOrder.status, *ORDER_STATUSES)
|
||||
|
||||
key = (sort_by or "seq").strip().lower()
|
||||
if key not in ORDER_SORT_KEYS:
|
||||
key = "seq"
|
||||
descending = (sort_order or "asc").strip().lower() == "desc"
|
||||
|
||||
# 负责人按显示的用户名排序(不是 id),需要一次 outerjoin;其它列都直接落在订单表上。
|
||||
if key == "owner":
|
||||
query = query.outerjoin(User, HuyaExternalOrder.owner_id == User.id)
|
||||
sort_column = User.username
|
||||
elif key == "status":
|
||||
# 与页头状态顺序保持一致,避免状态列按字母序排得莫名其妙。
|
||||
sort_column = func.field(HuyaExternalOrder.status, *ORDER_STATUSES)
|
||||
elif key == "bind":
|
||||
sort_column = HuyaExternalOrder.bind_game_account
|
||||
elif key == "seq":
|
||||
sort_column = HuyaExternalOrder.id
|
||||
else:
|
||||
sort_column = getattr(HuyaExternalOrder, key)
|
||||
|
||||
ordered = sort_column.desc() if descending else sort_column.asc()
|
||||
rows = (
|
||||
query.order_by(stage.asc(), HuyaExternalOrder.updated_at.desc())
|
||||
query.order_by(ordered, HuyaExternalOrder.id.asc())
|
||||
.offset((page - 1) * page_size)
|
||||
.limit(page_size)
|
||||
.all()
|
||||
|
||||
Reference in New Issue
Block a user