优化充值报表导出

app/api/statement/crud.py

@@ -110,6 +110,7 @@ class RechargeStatement(object):
             return []
         Logger().logger.info("获取order_id")
         for bus in query_data:
+            bus.pop('id')
             if bus['reference_type'] == 'userRecharge':
                 ref_type, o_id = bus['reference_number'].split('_')
                 if o_id not in self.order_id:
@@ -119,7 +120,6 @@ class RechargeStatement(object):
         pay_discount.append('_')  # 防止列表长度为1，sql查询tuple（）报错
         nick_sql = f"SELECT uuid,nick_name FROM v2_user where uuid in{tuple(pay_discount)}"
         nick_data = LinkMysql(env.DB_3YV2).query_mysql(nick_sql)
-        # nick_dict = {i: nick_data[i] for i in nick_data}
         nick_dict = {i['uuid']: i['nick_name'] for i in nick_data}
         if not self.order_id:
             for ni in query_data:
@@ -158,6 +158,7 @@ class RechargeStatement(object):
     def query_data(self, db, page, size, order_number, uuid, sid, start_time, end_time, type, menu_id, month_type,export_status):
         """列表"""
         query = []
+        query.append("type=1")
         if order_number:
             query.append(f"reference_number='{order_number}'")
         if uuid:

app/api/statement/views.py

@@ -11,6 +11,7 @@ from app.api.statement.crud import RechargeStatement, WithdrawStatement, get_men
 from app.api.statement.guild import GuildSet, paymentset_guild_data, outon_account_data, accout_list_data, \
     query_uuid_or_user_number, account_money, transfer_money, transfer_query, GuildSettlementAdd, GuildSettlementmodify
 from app.api.statement.schemas import PaymentWithdrawalList, PaymentAdd, PaymentAccountlList, UserNumber, CreateBill
+from libs.export import TableToFile
 from libs.img_code import new_upload_file, random_number
 from libs.result_format import HttpResultResponse, HttpMessage
 from libs.token_verify import login_required
@@ -39,8 +40,9 @@ def statement_derive_excel(request:Request,data: schemas.StatementList,db: Sessi
     total,statement_list,money= RechargeStatement().query_data(db, data.page, data.size, data.order_number, data.uuid,
                                                                data.sid, data.start_time, data.end_time, data.types,
                                                                data.menu_id, data.month_type,export_status)
-    field_list = ["id", "uuid", "充值金额（元）", "支付时间", "类型", "订单号"]
-    return crud.data_to_file(db, statement_list, "充值报表", header_list, field_list)
+    field_list = ["uuid", "充值金额（元）", "支付时间", "业务类型", "订单号", "昵称",  "充值状态", "用户Id", "渠道", "商户订单号"]
+    url = TableToFile(db, statement_list, "充值报表", header_list, field_list).main_method()
+    return HttpResultResponse(data=url)
 
 
 @router.get("/userWithdrawal/list")