Commit 5540ed9e authored by xianyang's avatar xianyang

优化账户余额

parent 4c079e49
This diff is collapsed.
...@@ -54,15 +54,15 @@ def finance_information(unique_tag: str, ...@@ -54,15 +54,15 @@ def finance_information(unique_tag: str,
end_time: Optional[str] = "", end_time: Optional[str] = "",
token=Depends(login_required)): token=Depends(login_required)):
# unique_tag:Optional[str] = Query(None, min_length=3, max_length=50, regex="^xiao\d+$") 参数验证 # unique_tag:Optional[str] = Query(None, min_length=3, max_length=50, regex="^xiao\d+$") 参数验证
"""账户财务信息""" """账户财务详情"""
res, total = crud.get_finance_info(unique_tag, page, size, start_time, end_time, 1) res, total = crud.get_finance_info(unique_tag, page, size, start_time, end_time, 1)
return HttpResultResponse(total=total.get("num"), data=res) return HttpResultResponse(total=total, data=res)
@router.post("/finance/info/excel") @router.post("/finance/info/excel")
def finance_info_excel(data: schemas.FinanceInfo, request: Request, def finance_info_excel(data: schemas.FinanceInfo, request: Request,
token=Depends(login_required), db: Session = Depends(get_db)): token=Depends(login_required), db: Session = Depends(get_db)):
"""账户财务信息导出""" """账户财务详情导出"""
headers = request.get("headers") headers = request.get("headers")
statement_list = crud.get_finance_info(data.unique_tag, data.page, data.size, data.start_time, data.end_time) statement_list = crud.get_finance_info(data.unique_tag, data.page, data.size, data.start_time, data.end_time)
df = ['表id', '金额', '入账', '出账', '时间'] df = ['表id', '金额', '入账', '出账', '时间']
...@@ -78,7 +78,7 @@ def finance_details(page: int, ...@@ -78,7 +78,7 @@ def finance_details(page: int,
type: Optional[int] = None, type: Optional[int] = None,
gift_type: Optional[str] = "", gift_type: Optional[str] = "",
token=Depends(login_required)): token=Depends(login_required)):
"""账户财务详情""" """账户财务明细"""
res, total, count = crud.get_finance_details(page, size, uuid, start_time, end_time, type, gift_type, is_list=1) res, total, count = crud.get_finance_details(page, size, uuid, start_time, end_time, type, gift_type, is_list=1)
return HttpResultResponse(total=total, data=res, count=count) return HttpResultResponse(total=total, data=res, count=count)
...@@ -86,7 +86,7 @@ def finance_details(page: int, ...@@ -86,7 +86,7 @@ def finance_details(page: int,
@router.post("/finance/details/excel") @router.post("/finance/details/excel")
def finance_info_excel(data: schemas.FinanceDetails, request: Request, def finance_info_excel(data: schemas.FinanceDetails, request: Request,
token=Depends(login_required), db: Session = Depends(get_db)): token=Depends(login_required), db: Session = Depends(get_db)):
"""账户财务详情导出""" """账户财务明细导出"""
headers = request.get("headers") headers = request.get("headers")
statement_list = crud.get_finance_details(data.page, data.size, data.uuid, data.start_time, data.end_time, data.type, data.gift_type) statement_list = crud.get_finance_details(data.page, data.size, data.uuid, data.start_time, data.end_time, data.type, data.gift_type)
field_head = ['订单号', '出入账方式', '礼物类型', '金额', '时间'] field_head = ['订单号', '出入账方式', '礼物类型', '金额', '时间']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment