From 6ada6371a3600555f52b21fc3701f9605cfc9156 Mon Sep 17 00:00:00 2001 From: han0 Date: Wed, 7 May 2025 08:35:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E6=9C=BA=E6=9C=AA=E6=8C=89=E6=9D=83=E9=87=8D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/calculators/__init__.py | 5 ++--- web/tasks/once/calculate.py | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/calculators/__init__.py b/web/calculators/__init__.py index baa7dc5..40cd36c 100644 --- a/web/calculators/__init__.py +++ b/web/calculators/__init__.py @@ -133,6 +133,7 @@ class Calculator: } def run(self): + self._get_weight() self.price_ftb, self.fluctuating_ftb = self._get_ftb_price() self.price_ss, self.fluctuating_ss = self._get_ss_price() self.price_fhb, self.fluctuating_fhb = self._get_fhb_price() @@ -204,8 +205,6 @@ class Calculator: return result def _get_recommend_price(self, round_by=10): - self._get_weight() - if not self.previous_prices: return 0, 0 @@ -231,7 +230,7 @@ class Calculator: def _get_weight(self): # 如果有上月数据按上月权重计算 无则平均数 - if self._previous_prices: + if self.previous_prices: self.weight_ftb = self._previous_prices.weight_ftb self.weight_ss = self._previous_prices.weight_ss self.weight_fhb = self._previous_prices.weight_fhb diff --git a/web/tasks/once/calculate.py b/web/tasks/once/calculate.py index dbdcf67..14f1a38 100644 --- a/web/tasks/once/calculate.py +++ b/web/tasks/once/calculate.py @@ -18,7 +18,7 @@ def calculate(year=2023, month=8): calculator.material_id = material.id calculator.unit = material.unit calculator.spec = material.spec - + # 设置小数位数,如果数据库中未设置则使用默认值0 calculator.round_bit = material.round_bit if material.round_bit is not None else 0 @@ -39,11 +39,11 @@ if __name__ == '__main__': from core.factory import ClientApp with ClientApp().app_context(): - calculate(2024, 4) + calculate(2025, 3) # for i in range(2, 12): # calculate(2022, i+1) - # for i in range(0, 12): - # calculate(2023, i+1) + # for i in range(1, 5+1): + # calculate(2025, i) # for i in range(6-1, 10): # calculate(2024, i+1)