添加转账字段

app/api/statement/guild.py

@@ -177,10 +177,10 @@ def accout_list_data(**params):
         accout_filters.append(f" create_time <= {time_str_to_timestamp(params.get('end_time') + ' 23:59:59')} ")
     if accout_filters:
         count_sql = f"select count(id) as num from fi_transfer_log where {' and '.join(accout_filters)}"
-        data_sql = f"select id,amount,dst_name,create_time,dst_uuid,transfer_uuid,remarks,operator from fi_transfer_log where {' and '.join(accout_filters)} order by id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
+        data_sql = f"select id,amount,dst_name,create_time,dst_uuid,transfer_uuid,remarks,operator,amount_type from fi_transfer_log where {' and '.join(accout_filters)} order by id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
     else:
         count_sql = f"select count(id) as num from fi_transfer_log"
-        data_sql = f"select * from fi_transfer_log order by id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
+        data_sql = f"select id,amount,dst_name,create_time,dst_uuid,transfer_uuid,remarks,operator,amount_type from fi_transfer_log order by id DESC limit {(int(params.get('page')) - 1) * params.get('size')},{params.get('size')}"
     with ThreadPoolExecutor(max_workers=2) as pool:
         future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, count_sql)
         future2 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, data_sql)
@@ -328,8 +328,8 @@ def transfer_money(db: Session, param, h_list):
         if is_success:
             return is_success
         user = query_token(db, h_list)
-        transfer_sql = f"insert into fi_transfer_log(amount, dst_name, create_time, transfer_uuid, dst_uuid, user_id, remarks, operator,operator_id) " \
-                       f"values({param.amount}, '{dst_name}', {get_now_timestamp()},'{param.transfer_id}','{param.dst_id}', {user_id if user_id else 0},'{param.remark}','{user.get('username')}',{user.get('user_id')});"
+        transfer_sql = f"insert into fi_transfer_log(amount, dst_name, create_time, transfer_uuid, dst_uuid, user_id, remarks, operator,operator_id, amount_type) " \
+                       f"values({param.amount}, '{dst_name}', {get_now_timestamp()},'{param.transfer_id}','{param.dst_id}', {user_id if user_id else 0},'{param.remark}','{user.get('username')}',{user.get('user_id')},{param.amount_type});"
         LinkMysql(env.DB_3YV2).perform_mysql(transfer_sql)
     except Exception as e:
         return e

app/api/statement/schemas.py

@@ -111,7 +111,6 @@ class UserNumber(BaseModel):
 
 
 
-
 class CreateBill(BaseModel):
     dst_id: Optional[str] = ""
     dst_name: Optional[str] = ""
@@ -120,6 +119,7 @@ class CreateBill(BaseModel):
     remark: Optional[str] = ""
     transfer_type: Optional[str] = ""
     type: Optional[int] = None
+    amount_type: Optional[str] = ""
 
     # @validator('transfer_id')
     # def transfer_id_must_contain_space(cls, v):

app/api/statement/views.py

@@ -167,7 +167,7 @@ def finance_fix(page: int,
 @router.post("/submit/fixTable")
 def finance_fix(data: acc_schemas.FixTable, request: Request,
                 token=Depends(login_required), db: Session = Depends(get_db)):
-    """新增修复报表"""
+    """新增财务修复报表"""
     if not all([data.money, data.uuid, data.amount_type, data.remark]):
         return HttpResultResponse(code=500, msg='缺少必传参数')
     header_list = request.get("headers")

main.py

@@ -34,8 +34,13 @@ async def add_process_time_header(request: Request, call_next):
     process_time = time.time() - start_time
     response.headers["X-Process-Time"] = str(process_time)
     if token:
+        try:
             payload = jwt.decode(token.replace('Bearer','').replace(' ',''), env.SECRET_KEY, algorithms=[env.ALGORITHM])
-        timestamp=payload.get("exp")
+        except Exception as e:
+            print(e)
+        finally:
+            payload = jwt.decode(token.replace('Bearer','').replace(' ',''), env.SECRET_KEY, algorithms=[env.ALGORITHM])
+        timestamp = payload.get("exp")
         access_token_expires = timedelta(hours=time_format(timestamp))
         create_access_token({'username':payload.get("xup"),'password':payload.get("password")},expires_delta=access_token_expires)  #更新token时间
     return response