礼物类型修改接口

app/api/account/crud.py

@@ -162,3 +162,16 @@ def get_account_type(db: Session, data):
     querydata, count = QueryAllData(db, AccountType, data, finance_filters).query_data()
     data = [QueryAllData.serialization(item) for item in querydata]
     return data, count
+
+
+def update_account_type(db: Session, data):
+
+    try:
+        db.query(AccountType).filter(AccountType.id == data.id).update({AccountType.key_name: data.key_name,
+                                                                        AccountType.key_value: data.key_value,
+                                                                        AccountType.type: data.type})
+        db.commit()
+        return True
+    except Exception as e:
+        print(e)
+        return False

app/api/account/schemas.py

@@ -49,9 +49,16 @@ class FixTable(BaseModel):
     remark: str
 
 
-class AccountTypeList(BaseModel):
-    page: int = None
-    size: int = None
+class AccountTypeUpdate(BaseModel):
+    id: int = None
     key_name: str = ""
     key_value: str = ""
     type: int = None
+
+
+class AccountTypeList(AccountTypeUpdate):
+    page: int = None
+    size: int = None
+
+
+

app/api/account/views.py

@@ -74,3 +74,12 @@ def finance_fix(data: schemas.AccountTypeList, db: Session = Depends(get_db)):
     """出入账目配置列表"""
     res, num = crud.get_account_type(db, data.dict(exclude_none=True))
     return HttpResultResponse(total=num, data=res)
+
+
+@router.post("/type/update")
+def finance_fix(data: schemas.AccountTypeList, db: Session = Depends(get_db)):
+    """出入账目类型修改"""
+    res = crud.update_account_type(db, data)
+    if res:
+        return HttpResultResponse()
+    return HttpResultResponse(code=422, msg='修改失败')

app/api/margin/crud.py

@@ -24,14 +24,16 @@ def get_margin(db: Session, param):
 
 
 def margin_dispose(db: Session, param):
-    if param.get("examine_status") == -1:
-        db.query(GuildMargin).filter(GuildMargin.id == param.get("id")).update({GuildMargin.status: 5})
-        db.commit()
-        return '拒绝成功'
     # 查询公会
     guid_info = db.query(Guild).filter(Guild.id == param.get("guild_id")).first()
     if not guid_info:
         return '公会不存在'
+    # 拒绝
+    if param.get("examine_status") == -1:
+        db.query(GuildMargin).filter(GuildMargin.id == param.get("id")).update({GuildMargin.status: 5})
+        db.commit()
+        return '拒绝成功'
+
     try:
         # 修改公会保证金记录 状态
         db.query(GuildMargin).filter(GuildMargin.id == param.get("id")).update({GuildMargin.status: 4})

app/api/margin/schemas.py

@@ -7,8 +7,8 @@ class GuildMarginList(BaseModel):
     size: Optional[int] = None
     guild_id: Optional[int] = None
     status: Optional[int] = None
-    start_time: Optional[int] = None
-    end_time: Optional[int] = None
+    start_time: Optional[str] = ""
+    end_time: Optional[str] = ""
 
 
 class MarginExamine(BaseModel):