优化修复报表，账户转账

app/api/account/schemas.py

@@ -72,13 +72,13 @@ class Recovery_fix(PublicModel):
 
 
 class RecoveryTable(BaseModel):
-    uuid: Optional[str] = None
-    type: Optional[int] = None
-    out_money: Optional[int] = None
-    entry_money: Optional[float] = None
-    from_time: Optional[str] = None
-    cont: Optional[str] = None
+    uuid: str
+    type: int
+    out_money: int
+    entry_money: float
+    from_time: str
+    cont: str
 
 
 class RecoveryupdateTable(RecoveryTable):
-    id: int
\ No newline at end of file
+    id: int

app/api/statement/guild.py

@@ -239,17 +239,18 @@ def recovery_fix_data(db: Session, dbname, params):
 def create_recovery_table(db: Session, param):
     """增加修复报表"""
     try:
-        present = Account_log(type=param.type, uuid=param.uuid,out_money=param.out_money,
-                                cont=param.cont, entry_money=param.entry_money,from_time=param.from_time,
-                                create_time=get_now_datetime())
+        present = Account_log(type=param.type, uuid=param.uuid, out_money=param.out_money,
+                              cont=param.cont, entry_money=param.entry_money, from_time=param.from_time,
+                              create_time=get_now_datetime())
         db.add(present)
         db.commit()
         db.refresh(present)
     except Exception as e:
-         return {}
+        return {}
     return present
 
-def update_recovery_table(db: Session,data):
+
+def update_recovery_table(db: Session, data):
     """修改修复报表"""
     try:
         accout_filters = []
@@ -257,6 +258,6 @@ def update_recovery_table(db: Session,data):
         db.query(Account_log).filter(Account_log.id == data.get("id")).update(data)
         db.commit()
     except Exception as e:
-         print(e)
-         return {}
-    return data
\ No newline at end of file
+        print(e)
+        return {}
+    return data

app/api/statement/schemas.py

@@ -108,12 +108,24 @@ class UserNumber(BaseModel):
 
 
 class CreateBill(BaseModel):
-    dst_id: str
+    dst_id: Optional[str] = ""
     dst_name: str = ""
     amount: float
-    transfer_id: str
+    transfer_id: Optional[str] = ""
     transfer_name: str = ""
-    remark: str
+    remark: Optional[str] = ""
     type: int
     nick_name: Optional[str] = ""
     transfer_type: Optional[str] = ""
+
+    # @validator('transfer_id')
+    # def transfer_id_must_contain_space(cls, v):
+    #     if not v:
+    #         raise ValueError('缺少必传参数')
+    #     return v
+    #
+    # @validator('remark')
+    # def remark_must_contain_space(cls, v):
+    #     if not v:
+    #         raise ValueError('缺少必传参数remark')
+    #     return v

app/api/statement/views.py

@@ -115,6 +115,8 @@ def query_uuid_account(data: UserNumber, token=Depends(login_required), db: Sess
 def account_transfer_money(data: CreateBill, request: Request,
                            token=Depends(login_required), db: Session = Depends(get_db)):
     """账户转账"""
+    if not all([data.dst_id, data.transfer_id, data.amount, data.transfer_type, data.remark]):
+        return HttpResultResponse(code=500, msg="缺少必传参数")
     header_list = request.get("headers")
     res_info = transfer_money(db, data, header_list)
     if not res_info: