优化充值报表和导出

app/api/statement/crud.py

@@ -127,6 +127,7 @@ class RechargeStatement(object):
                 ni['nick_name'] = nick_dict[ni['uuid']]
                 ni['income_money'] = ni['amount']
                 ni['status'] = 1
+                ni['amount'] = 0
             return query_data
         if len(self.order_id) == 1:
             o_sql = f"SELECT o.id,o.money,o.userid,v.nick_name,o.status,o.paychannel,o.sid,o.current FROM orders as o LEFT JOIN v2_user as v on o.userid=v.user_id where o.id={self.order_id[0]}"
@@ -154,7 +155,6 @@ class RechargeStatement(object):
                     x['paychannel'] = pay_dict.get(y['paychannel'], y['paychannel'])
                     x['sid'] = y['sid']
                 else:
-                    x['income_money'] = x['amount']
                     x['nick_name'] = nick_dict[x['uuid']]
                     x['status'] = 1
         Logger().logger.info(f"拼接的数据：{query_data[0]}")

app/api/statement/views.py

@@ -40,7 +40,7 @@ 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 = ["uuid", "充值金额（元）", "支付时间", "业务类型", "订单号", "昵称",  "充值状态", "用户Id", "渠道", "商户订单号"]
+    field_list = ["uuid", "充值金额(元)", "支付时间", "业务类型", "订单号", "昵称",  "充值状态", "到账金额(元)", "用户Id", "渠道", "商户订单号"]
     url = TableToFile(db, statement_list, "充值报表", header_list, field_list).main_method()
     return HttpResultResponse(data=url)