优化充值列表

app/api/statement/crud.py

@@ -82,6 +82,10 @@ class RechargeStatement(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 == 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 month_type == 1:
             if start_time:
                 query.append(f" create_time >= {time_str_to_timestamp(start_time + ' 00:00:00')} ")
@@ -112,7 +116,7 @@ class RechargeStatement(object):
         if month_type == 1:
             count_sql = f"SELECT count(*) FROM assets_log_{now_month}  where {query}"
             count = self.linkmysql.query_mysql(count_sql)[0].get("count(*)")
-            sql = f"SELECT id,a.uuid,a.amount,FROM_UNIXTIME(a.create_time,'%Y-%c-%d %h:%i:%s') as payment_time,a.reference_type,a.reference_number,a.amount_type FROM assets_log_{now_month} as a where  {query}  ORDER BY id desc limit {(int(page) - 1) * size},{size}"
+            sql = f"SELECT id,a.uuid,a.amount/1000 as amount,FROM_UNIXTIME(a.create_time,'%Y-%c-%d %h:%i:%s') as payment_time,a.reference_type,a.reference_number,a.amount_type FROM assets_log_{now_month} as a where  {query}  ORDER BY id desc limit {(int(page) - 1) * size},{size}"
             once_res = self.linkmysql.query_mysql(sql)
             money_sql = f"SELECT sum(amount) FROM assets_log_{now_month}  where {query}"
             moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(amount)") if \
@@ -123,12 +127,12 @@ class RechargeStatement(object):
             count = self.linkmysql.query_mysql(count_sql)[0].get("sum(a.b)")
             query1 = (' and '.join(query[0]))
             query2 = (' and '.join(query[1]))
-            sql = f"SELECT  id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number,amount_type FROM assets_log_{int(now_month[0])}  where {query1}  UNION ALL SELECT id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number,amount_type FROM assets_log_{int(now_month[1])}  where {query2}  ORDER BY id desc limit {(int(page) - 1) * size},{size}"
+            sql = f"SELECT  id,uuid,amount/1000 as amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number,amount_type FROM assets_log_{int(now_month[0])}  where {query1}  UNION ALL SELECT id,uuid,amount,FROM_UNIXTIME(create_time,'%Y-%c-%d %h:%i:%s') as payment_time,reference_type,reference_number,amount_type FROM assets_log_{int(now_month[1])}  where {query2}  ORDER BY id desc limit {(int(page) - 1) * size},{size}"
             once_res = self.linkmysql.query_mysql(sql)
             money_sql = f"SELECT sum(a.b) FROM ("f"SELECT sum(amount) as b FROM assets_log_{int(now_month[0])}  where {(' and '.join(query[0]))} UNION ALL SELECT sum(amount)FROM assets_log_{int(now_month[1])}  where {(' and '.join(query[1]))})  AS a "
             moeny_data = self.linkmysql.query_mysql(money_sql)[0].get("sum(a.b)") if \
                 self.linkmysql.query_mysql(money_sql)[0].get("sum(a.b)") != None else 0
-        return count, once_res, moeny_data
+        return count, once_res, moeny_data/1000
 
     def thread_data(self, month_type, query, page, size):
         now_month = get_month_last_month(month_type)

app/api/statement/views.py

@@ -34,7 +34,7 @@ def statement_derive_excel(request:Request,data: schemas.StatementList,db: Sessi
     """充值报表导出"""
     header_list = request.get("headers")
     statement_list = RechargeStatement().get_statements(db,data)
-    field_list = ["uuid", "充值金额（远）", "支付时间", "类型", "订单号"]
+    field_list = ["uuid", "充值金额（元）", "支付时间", "类型", "订单号"]
     return crud.data_to_file(db, statement_list, "充值报表", header_list, field_list)