From 62555671e87a4f2347d0387ef1d9170f5f52a40e Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Tue, 7 May 2024 20:01:08 +0800 Subject: [PATCH] fix --- cronjob/vas/calc.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/cronjob/vas/calc.py b/cronjob/vas/calc.py index ae697ba..995eebb 100644 --- a/cronjob/vas/calc.py +++ b/cronjob/vas/calc.py @@ -105,25 +105,25 @@ and mid>0 zone_moment_cnt, zone_moment_money, other_cnt, other_money, total_money, streamer_money, official_money, - "%.2f%%" % (safe_div(official_money, total_money)), - "%.2f%%" % (safe_div(membership_money, total_money)), - "%.2f%%" % (safe_div(zone_admission_money, total_money)), - "%.2f%%" % (safe_div(zone_superfan_money, total_money)), - "%.2f%%" % (safe_div(zone_moment_money, total_money)), - "%.2f%%" % (safe_div(other_money, total_money)) + "%.2f%%" % (safe_div(official_money, total_money) * 100.0), + "%.2f%%" % (safe_div(membership_money, total_money) * 100.0), + "%.2f%%" % (safe_div(zone_admission_money, total_money) * 100.0), + "%.2f%%" % (safe_div(zone_superfan_money, total_money) * 100.0), + "%.2f%%" % (safe_div(zone_moment_money, total_money) * 100.0), + "%.2f%%" % (safe_div(other_money, total_money) * 100.0) ] csv_w.append([data]) print(data) -# st_et_str_map = gen_st_et_str_map_v2( -# "2024-04-30 00:00:00", "2024-05-06 00:00:00" -# ) - -st_et_str_map = gen_st_et_str_map( - "2024-04-30 00:00:00", 1 +st_et_str_map = gen_st_et_str_map_v2( + "2024-04-30 00:00:00", "2024-05-06 00:00:00" ) +# st_et_str_map = gen_st_et_str_map( +# "2024-04-30 00:00:00", 1 +# ) + for st_str, et_str in st_et_str_map.items(): s = S( get_ts_by_str(st_str), get_ts_by_str(et_str)