From 9373f843c45c411accfbdf9f433d93f64ee335c5 Mon Sep 17 00:00:00 2001 From: pengtao Date: Thu, 21 Nov 2019 10:26:05 +0800 Subject: [PATCH] fixbug --- daily_report/dreport.py | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/daily_report/dreport.py b/daily_report/dreport.py index e45d565..36b256b 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -474,28 +474,28 @@ class Report: args['tga'] = tga temp['all'] = self.get_all_data(**args) - ss_input_fromappids = self.get_ss_input_fromappid(args) - ss_output_fromappids = self.get_ss_output_fromappid(args) + if temp['all']: + ss_input_fromappids = self.get_ss_input_fromappid(args) + ss_output_fromappids = self.get_ss_output_fromappid(args) - mp = MpInterface() - fromappids = mp.get_fromappid_cn(args['gameid'], args['channelid']) - log.info(f"1={fromappids} 2={ss_input_fromappids} 3={ss_output_fromappids}") - if fromappids and ss_input_fromappids: - for item in ss_input_fromappids: - args['fromappid'] = item - args['fromappid_cn'] = fromappids.get(item, None) or item - temp['input'].append(self.get_input_fromappid(**args)) - - if fromappids and ss_output_fromappids: - for item in ss_output_fromappids: - if args['gameid'] in self.not_minigames: - args['fromappid'] = item.split('_success')[0] - else: + mp = MpInterface() + fromappids = mp.get_fromappid_cn(args['gameid'], args['channelid']) + log.info(f"1={fromappids} 2={ss_input_fromappids} 3={ss_output_fromappids}") + if fromappids and ss_input_fromappids: + for item in ss_input_fromappids: args['fromappid'] = item - args['fromappid_cn'] = fromappids.get(item.split('_success')[0], None) or item - temp['output'].append(self.get_output_fromappid(**args)) - data.append(temp) + args['fromappid_cn'] = fromappids.get(item, None) or item + temp['input'].append(self.get_input_fromappid(**args)) + if fromappids and ss_output_fromappids: + for item in ss_output_fromappids: + if args['gameid'] in self.not_minigames: + args['fromappid'] = item.split('_success')[0] + else: + args['fromappid'] = item + args['fromappid_cn'] = fromappids.get(item.split('_success')[0], None) or item + temp['output'].append(self.get_output_fromappid(**args)) + data.append(temp) return data