状态修改

app/api/statement/crud.py

@@ -86,7 +86,11 @@ class RechargeStatement(object):
         else:
             querydata = db.query(Menuconfig).filter(Menuconfig.menu_type == 1)  # 1是充值
             reference_data = [QueryAllData.serialization(item, remove={'menu_name', 'remark', 'menu_type', 'create_time', 'id'}) for item in querydata]
-            query.append(f"reference_type in{tuple([i['menu_label'] for i in reference_data])}")
+            if len([item.get("menu_label") for item in reference_data]) > 1:
+                reference_type = tuple([item.get("menu_label") for item in reference_data])
+            else:
+                reference_type = "('" + [item.get("menu_label") for item in reference_data][0] + "')"
+            query.append(f"reference_type in {reference_type}")
         if month_type == 1:
             if start_time:
                 query.append(f" create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
@@ -234,6 +238,16 @@ class WithdrawStatement(object):
             else:
                 reference_type = "('" + [item.get("menu_label") for item in reference_data][0] + "')"
             query.append(f"reference_type in {reference_type}")
+        else:
+            querydata = db.query(Menuconfig).filter(Menuconfig.menu_type == 3)  # 3是用户提现
+            reference_data = [
+                QueryAllData.serialization(item, remove={'menu_name', 'remark', 'menu_type', 'create_time', 'id'}) for
+                item in querydata]
+            if len([item.get("menu_label") for item in reference_data]) > 1:
+                reference_type = tuple([item.get("menu_label") for item in reference_data])
+            else:
+                reference_type = "('" + [item.get("menu_label") for item in reference_data][0] + "')"
+            query.append(f"reference_type in {reference_type}")
         if month_type == 1:
             if start_time:
                 query.append(f" create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
@@ -287,6 +301,16 @@ class WithdrawStatement(object):
             else:
                 reference_type = "('" + [item.get("menu_label") for item in reference_data][0] + "')"
             query.append(f"reference_type in {reference_type}")
+        else:
+            querydata = db.query(Menuconfig).filter(Menuconfig.menu_type == 4)  # 4是公会提现
+            reference_data = [
+                QueryAllData.serialization(item, remove={'menu_name', 'remark', 'menu_type', 'create_time', 'id'}) for
+                item in querydata]
+            if len([item.get("menu_label") for item in reference_data]) > 1:
+                reference_type = tuple([item.get("menu_label") for item in reference_data])
+            else:
+                reference_type = "('" + [item.get("menu_label") for item in reference_data][0] + "')"
+            query.append(f"reference_type in {reference_type}")
         if month_type == 1:
             if start_time:
                 query.append(f" create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")

app/api/statement/guild.py

@@ -535,38 +535,45 @@ def GuildSettlementAdd(db, data):
         guild_sql = f"select * from guild where id={guild_data.guild_id} limit 0,1"
         guild_info = LinkMysql(env.DB_3YV2).query_mysql(guild_sql)
         if not guild_info:
-            return 400,{"name":"公会数据错误"}
+            return 400,{"msg":"公会数据错误"}
         acc_sql = f"select * from fi_account where config_key='guildSettlement' limit 0,1"
         acc_info = LinkMysql(env.DB_3YV2).query_mysql(acc_sql)
         if not acc_info:
-            return 400, {"name": "财务平台账户数据错误"}
+            return 400, {"msg": "财务平台账户数据错误"}
         if guild_data.status == 0:
             first_sta = 00
             # 钻石处理
             if guild_data.balance and guild_data.balance > 0:
                 balance_refer_num = f'guild_settlement_{data.id}_balance'
-                is_failure = transfer_trigger_task(guild_info[0].get("uuid"), 0, data.balance, 'guild_clear', 'consumable', balance_refer_num, [], 1, acc_info[0]['uuid'])
+                is_failure = transfer_trigger_task(guild_info[0].get("uuid"), 0, float(guild_data.balance), 'guild_clear', 'consumable', balance_refer_num, [], 1, acc_info[0]['uuid'])
                 if is_failure:
-                    return 400, {"name": "结算错误"}
+                    return 400, {"msg": "结算错误"}
                 first_sta = 1
             # 珍珠处理
             if guild_data.pearl and guild_data.pearl > 0:
                 pearl_refer_num = f'guild_settlement_{data.id}_pearl'
-                is_lose = transfer_trigger_task(guild_info[0].get("uuid"), 0, data.pearl, 'guild_clear', 'withdrawable', pearl_refer_num, [], 1, acc_info[0]['uuid'])
+                is_lose = transfer_trigger_task(guild_info[0].get("uuid"), 0, float(guild_data.pearl), 'guild_clear', 'withdrawable', pearl_refer_num, [], 1, acc_info[0]['uuid'])
                 if is_lose:
-                    return 400, {"name": "结算错误"}
+                    return 400, {"msg": "结算错误"}
                 first_sta = 1
             if first_sta:
+                try:
                     url = "http://106.55.103.148:8787/api/guild/editSettlementLog"
                     json={'id': guild_data.work_id, 'status': 2}
                     res = requests.post(url=url, json=json)
                     if res.status_code != 200:
-                    return 400, {"name": "财务请求失败"}
-                guild_data = db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).first()
-                db.query(GuildSettlementLog).filter(GuildSettlementLog.work_id == guild_data.work_id).update(
-                    {GuildSettlementLog.status: data.status, GuildSettlementLog.update_time: get_now_timestamp()})
+                        return 400, {"msg": "业务请求失败"}
+                except:
+                    db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
+                        {GuildSettlementLog.status: 3, GuildSettlementLog.update_time: get_now_timestamp()})
+                    db.commit()
+                    return 400, {"msg": "业务请求失败"}
+                db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update({GuildSettlementLog.status: data.status, GuildSettlementLog.update_time: get_now_timestamp()})
+                db.commit()
+            else:
+                db.query(GuildSettlementLog).filter(GuildSettlementLog.id == data.id).update(
+                    {GuildSettlementLog.status: 3, GuildSettlementLog.update_time: get_now_timestamp()})
                 db.commit()
-        return ''
     else:
         db_export = GuildSettlementLog(work_id=data.id, guild_id=data.guild_id, balance=data.balance,
                                        pearl=data.pearl, status=data.status, create_time=data.create_time,
@@ -575,3 +582,5 @@ def GuildSettlementAdd(db, data):
                                        pledge_deposit_money=data.pledge_deposit_money)
         db.add(db_export)
         db.commit()
+    return 200,{"msg": "操作成功"}
+

models/guild.py

@@ -144,7 +144,7 @@ class GuildSettlementLog(Base, SerializerMixin):
     bank_no =Column(String(122), comment="账户名称")
     guild_name =Column(String(122), comment="公会名字")
     pearl = Column(DECIMAL(15,3),default='0.000', comment="结算时候的珍珠，RMB单位")
-    status = Column(Integer, comment="0待结算，1待结款，2已完成")
+    status = Column(Integer, comment="0待结算，1待结款，2已完成,3结算失败")
     create_time = Column(Integer,default='0',comment="创建时间")
     update_time = Column(DateTime,default='0',comment="修改时间")
     account_name = Column(String(122), comment="户头名称")