From a41893f22de2ed064cfba1a85f3f24d6c7f43672 Mon Sep 17 00:00:00 2001 From: han0 Date: Mon, 7 Apr 2025 14:30:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/calculators/__init__.py | 4 +++- web/tasks/once/calculate.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/calculators/__init__.py b/web/calculators/__init__.py index 55040fd..f297547 100644 --- a/web/calculators/__init__.py +++ b/web/calculators/__init__.py @@ -1,3 +1,5 @@ +from decimal import Decimal + from commons.models.data_fujian import DataFujian from commons.models.data_network import DataNetwork from commons.models.fujian_survey import FujianSurvey @@ -217,7 +219,7 @@ class Calculator: fluctuating = sum(self._fluctuatings) / sum([self.weight_ftb, self.weight_ss, self.weight_fhb, self.weight_network, self.weight_survey]) fluctuating = self.round_method(fluctuating, self.round_bit) - price = fluctuating + previous_price + price = Decimal(fluctuating) + Decimal(previous_price) price = self.round_method(price, self.round_bit) return price, fluctuating diff --git a/web/tasks/once/calculate.py b/web/tasks/once/calculate.py index 2cc972c..dbdcf67 100644 --- a/web/tasks/once/calculate.py +++ b/web/tasks/once/calculate.py @@ -39,7 +39,7 @@ if __name__ == '__main__': from core.factory import ClientApp with ClientApp().app_context(): - calculate(2023, 3) + calculate(2024, 4) # for i in range(2, 12): # calculate(2022, i+1)