From 66ce227835ff7bf903973df5486bfb83a6e88725 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Wed, 22 Jan 2025 17:22:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E5=8D=8A=E5=B9=B4=E5=9D=87=E4=BB=B7=E6=98=BE=E7=A4=BA=E4=BD=8D?=
 =?UTF-8?q?=E6=95=B0=E5=BC=82=E5=B8=B8=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/collectors/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/collectors/__init__.py b/web/collectors/__init__.py
index 26ba857..aa81e3c 100644
--- a/web/collectors/__init__.py
+++ b/web/collectors/__init__.py
@@ -17,6 +17,7 @@ class Collector:
         self.year = year
         self.month = month
         self.force = True  # todo-2 已发布的价格不在覆盖计算
+        self.digit_map = {}
 
     def get_avg(self):
         query = PricePublish.get_query(name_in=(
@@ -110,7 +111,6 @@ class Collector:
             func.avg(PricePublish.price_zhangzhoukfq),
             PricePublish.tax,
             PricePublish.unit,
-            PricePublish.display_digit
         )
         query = query.filter(PricePublish.price != 0)
         query = query.group_by(
@@ -119,12 +119,12 @@ class Collector:
             PricePublish.spec,
             PricePublish.tax,
             PricePublish.unit,
-            PricePublish.display_digit,
         )
         data = query.all()
         for item in data:
             material_id, name, spec, price, price_fuzhou, price_xiamen, price_putian, price_sanming, price_quanzhou, \
-            price_zhangzhou, price_nanpin, price_longyan, price_ningde, price_pintan, price_zhangzhoukfq, tax, unit, display_digit = item
+            price_zhangzhou, price_nanpin, price_longyan, price_ningde, price_pintan, price_zhangzhoukfq, tax, unit, = item
+            display_digit = self.digit_map.get(material_id, 1)
             PricePublish(
                 year=self.year,
                 month=self.month,
@@ -311,6 +311,7 @@ class Collector:
             '3003001',
         ))
         data = query.all()
+        self.digit_map = {i.material_id:i.display_digit for i in data}
         for item in data:
             PricePublish(
                 year=self.year,