优化财务修复报表

app/api/account/schemas.py

@@ -48,8 +48,9 @@ class FixTable(BaseModel):
     type: int
     uuid: str = ''
     money: float
-    amount_type: str = "consumable"
+    amount_type: Optional[str] = "consumable"
     remark: str
+    unique_tag: Optional[str] = ""
 
 
 class AccountTypeUpdate(BaseModel):

app/api/statement/guild.py

@@ -335,9 +335,15 @@ def transfer_money(db: Session, param, h_list):
 
 def create_fix_table(db: Session, param, h_list):
     """增加修复报表"""
+    uuid = param.uuid
+    unique_res = []
+    if param.type == 0:
+        acc_sql = f"select unique_tag,uuid from fi_account where unique_tag='{param.unique_tag}'"
+        unique_res = LinkMysql(env.DB_3YV2).query_mysql(acc_sql)
+        uuid = unique_res[0]['uuid']
     if param.amount_type == 'backpack':
-        guild_sql = f"select count(id) as num from guild where uuid='{param.uuid}'"
-        user_sql = f"select user_id,nick_name,user_number from v2_user where uuid='{param.uuid}'"
+        guild_sql = f"select count(id) as num from guild where uuid='{uuid}'"
+        user_sql = f"select user_id,nick_name,user_number from v2_user where uuid='{uuid}'"
         with ThreadPoolExecutor(max_workers=2) as pool:
             future1 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, guild_sql)
             future2 = pool.submit(LinkMysql(env.DB_3YV2).query_mysql, user_sql)
@@ -360,7 +366,7 @@ def create_fix_table(db: Session, param, h_list):
         method = 'Server.BaseExecute.Increase'
         data = {
             "ip": ip,
-            "dst_uuid": param.uuid,
+            "dst_uuid": uuid,
             "dst_amount_type": param.amount_type,
             "amount": param.money,
             "fee": 0,
@@ -373,7 +379,7 @@ def create_fix_table(db: Session, param, h_list):
         method = 'Server.BaseExecute.Reduce'
         data = {
             "ip": ip,
-            "src_uuid": param.uuid,
+            "src_uuid": uuid,
             "src_amount_type": param.amount_type,
             "amount": param.money,
             "fee": 0,
@@ -385,11 +391,7 @@ def create_fix_table(db: Session, param, h_list):
     clearing_res = search(data, method)
     print(clearing_res)
     if clearing_res['status']:
-        unique_res = []
-        if param.type == 0:
-            acc_sql = f"select unique_tag from fi_account where uuid='{param.uuid}'"
-            unique_res = LinkMysql(env.DB_3YV2).query_mysql(acc_sql)
-        unique_tag = unique_res[0]['unique_tag'] if unique_res else param.uuid
+        unique_tag = unique_res[0]['unique_tag'] if unique_res else uuid
         user = query_token(db, h_list)
         try:
             insert_fix_sql = f"insert into finance_fix_log(type, money, create_time, unique_tag, amount_type, remark, operator,operator_id) " \

app/api/statement/views.py

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