From 1c1c2513c706ed85588ccb834151fb3dc296a541 Mon Sep 17 00:00:00 2001
From: han0 <wslshanlin@sina.com>
Date: Fri, 21 Feb 2025 15:10:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=A8=8E=E7=8E=87?=
 =?UTF-8?q?=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/collectors/__init__.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/web/collectors/__init__.py b/web/collectors/__init__.py
index c91abbe..37660cd 100644
--- a/web/collectors/__init__.py
+++ b/web/collectors/__init__.py
@@ -18,6 +18,8 @@ class Collector:
         # 获取所有材料信息
         self.materials = Material.query.all()
         self.material_codes = [m.code for m in self.materials if m.code]
+        # 缓存材料税率信息
+        self.tax_map = {m.code: m.tax for m in self.materials if m.code}
 
     def get_avg(self):
         query = PricePublish.get_query(material_id_in=self.material_codes)
@@ -72,7 +74,7 @@ class Collector:
                 price_ningde=round(price_ningde or 0, 2),
                 price_pintan=round(price_pintan or 0, 2),
                 price_zhangzhoukfq=round(price_zhangzhoukfq or 0, 2),
-                tax=tax,
+                tax=self.tax_map.get(material_id, tax),  # 从材料表获取税率
                 type=2,
                 unit=unit,
                 display_digit=display_digit,
@@ -100,7 +102,7 @@ class Collector:
                 price_ningde=item.price,
                 price_pintan=item.price,
                 price_zhangzhoukfq=item.price,
-                tax=item.tax,
+                tax=self.tax_map.get(item.material_id, item.tax),   # 从材料表获取税率
                 type=1,
                 unit=item.unit
             ).upsert()
@@ -110,6 +112,7 @@ class Collector:
         data = query.all()
         self.digit_map = {i.material_id:i.display_digit for i in data}
         for item in data:
+            # 从材料表获取税率
             PricePublish(
                 year=self.year,
                 month=self.month,
@@ -128,7 +131,7 @@ class Collector:
                 price_ningde=item.price_recommend,
                 price_pintan=item.price_recommend,
                 price_zhangzhoukfq=item.price_recommend,
-                tax=9.00,
+                tax=self.tax_map.get(item.material_id),
                 type=1,
                 unit=item.unit,
                 display_digit=item.display_digit,