Commit 26bbf84a authored by xianyang's avatar xianyang

优化修复报表,账户转账

parent 33f6e010
...@@ -72,12 +72,12 @@ class Recovery_fix(PublicModel): ...@@ -72,12 +72,12 @@ class Recovery_fix(PublicModel):
class RecoveryTable(BaseModel): class RecoveryTable(BaseModel):
uuid: Optional[str] = None uuid: str
type: Optional[int] = None type: int
out_money: Optional[int] = None out_money: int
entry_money: Optional[float] = None entry_money: float
from_time: Optional[str] = None from_time: str
cont: Optional[str] = None cont: str
class RecoveryupdateTable(RecoveryTable): class RecoveryupdateTable(RecoveryTable):
......
...@@ -239,8 +239,8 @@ def recovery_fix_data(db: Session, dbname, params): ...@@ -239,8 +239,8 @@ def recovery_fix_data(db: Session, dbname, params):
def create_recovery_table(db: Session, param): def create_recovery_table(db: Session, param):
"""增加修复报表""" """增加修复报表"""
try: try:
present = Account_log(type=param.type, uuid=param.uuid,out_money=param.out_money, 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, cont=param.cont, entry_money=param.entry_money, from_time=param.from_time,
create_time=get_now_datetime()) create_time=get_now_datetime())
db.add(present) db.add(present)
db.commit() db.commit()
...@@ -249,7 +249,8 @@ def create_recovery_table(db: Session, param): ...@@ -249,7 +249,8 @@ def create_recovery_table(db: Session, param):
return {} return {}
return present return present
def update_recovery_table(db: Session,data):
def update_recovery_table(db: Session, data):
"""修改修复报表""" """修改修复报表"""
try: try:
accout_filters = [] accout_filters = []
......
...@@ -108,12 +108,24 @@ class UserNumber(BaseModel): ...@@ -108,12 +108,24 @@ class UserNumber(BaseModel):
class CreateBill(BaseModel): class CreateBill(BaseModel):
dst_id: str dst_id: Optional[str] = ""
dst_name: str = "" dst_name: str = ""
amount: float amount: float
transfer_id: str transfer_id: Optional[str] = ""
transfer_name: str = "" transfer_name: str = ""
remark: str remark: Optional[str] = ""
type: int type: int
nick_name: Optional[str] = "" nick_name: Optional[str] = ""
transfer_type: 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
...@@ -115,6 +115,8 @@ def query_uuid_account(data: UserNumber, token=Depends(login_required), db: Sess ...@@ -115,6 +115,8 @@ def query_uuid_account(data: UserNumber, token=Depends(login_required), db: Sess
def account_transfer_money(data: CreateBill, request: Request, def account_transfer_money(data: CreateBill, request: Request,
token=Depends(login_required), db: Session = Depends(get_db)): 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") header_list = request.get("headers")
res_info = transfer_money(db, data, header_list) res_info = transfer_money(db, data, header_list)
if not res_info: if not res_info:
......
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