保证金接口优化优化

app/api/margin/crud.py

-from sqlalchemy import and_
 from sqlalchemy.orm import Session
-from libs.functions import wrapper_out
+from libs.orm import QueryAllData
 from models.margin import GuildMargin
 
 
-@wrapper_out()
 def get_margin(db: Session, param):
+    """保证金列表，查询"""
     guild_filters = []
-    if param.guild_id:
-        guild_filters.append(GuildMargin.guild_id == param.guild_id)
-    if param.status:
-        guild_filters.append(GuildMargin.status == param.status)
-    if param.start_time:
-        guild_filters.append(GuildMargin.create_time >= param.start_time)
-    if param.end_time:
-        guild_filters.append(GuildMargin.create_time <= param.end_time)
-    if not guild_filters:
-        query_res = db.query(GuildMargin).all()
-        return [i.to_dict() for i in query_res][::-1]
-    else:
-        get_user_orm_sql = db.query(GuildMargin).filter(and_(*guild_filters))
-        query_res = db.execute(get_user_orm_sql).fetchall()
-    return [i[0].to_dict() for i in query_res][::-1]
+    if param.get("guild_id"):
+        guild_filters.append(GuildMargin.guild_id == param.get("guild_id"))
+    if param.get("status"):
+        guild_filters.append(GuildMargin.status == param.get("status"))
+    if param.get("start_time"):
+        guild_filters.append(GuildMargin.create_time >= param.get("start_time") + " 00:00:00")
+    if param.get("end_time"):
+        guild_filters.append(GuildMargin.create_time <= param.get("end_time") + " 23:59:59")
+    querydata, count = QueryAllData(db, GuildMargin, param, guild_filters).query_data()
+    data = [QueryAllData.serialization(item) for item in querydata]
+    return data, count

app/api/margin/views.py

@@ -10,5 +10,5 @@ router = APIRouter()
 @router.post("/list")
 def guild_margin_list(data: schemas.GuildMarginList, db: Session = Depends(get_db)):
     """保证金列表"""
-    result = crud.get_margin(db, data)
-    return HttpResultResponse(total=len(result), data=result[int(data.page-1)*data.size:data.page*data.size])
+    result, total = crud.get_margin(db, data.dict(exclude_none=True))
+    return HttpResultResponse(total=total, data=result)

models/margin.py

@@ -16,6 +16,6 @@ class GuildMargin(Base, SerializerMixin):
     violate_images = Column(String(255), comment="违规图片地址")
     deduction_images = Column(String(255), comment="扣减图片地址")
     status = Column(Integer, comment="3表示未处理 4表示成功 5表示拒绝")
-    create_time = Column(Integer, comment="添加时间")
+    create_time = Column(DateTime, comment="添加时间")
 
     __table_args__ = {'comment': '公会保证金记录'}