sale flag number logger opt

Hobr · Jul 7, 2024 · 80f1f9d · 80f1f9d
1 parent e3363f0
commit 80f1f9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/util/Bilibili/__init__.py b/util/Bilibili/__init__.py
@@ -231,7 +231,7 @@ def QueryAmount(self) -> tuple:
                     self.cost = path["price"]
                     self.saleStart = path["saleStart"]
                     clickable = path["clickable"]
-                    saleable = path["sale_flag_number"] in [2, 8]  # 2: 可售 4: 已售罄 8: 暂时售罄
+                    salenum = path["sale_flag_number"]
 
                 # 没保存Sku位置
                 else:
@@ -242,15 +242,15 @@ def QueryAmount(self) -> tuple:
                                     self.cost = sku["price"]
                                     self.saleStart = sku["saleStart"]
                                     clickable = sku["clickable"]
-                                    saleable = sku["sale_flag_number"] in [2, 8]  # 2: 可售 4: 已售罄 8: 暂时售罄
+                                    salenum = sku["sale_flag_number"]
                                     self.screenPath = i
                                     self.skuPath = j
                                     break
             case _:
                 clickable = False
-                saleable = False
+                salenum = 4
 
-        return code, msg, clickable, saleable
+        return code, msg, clickable, salenum
 
     @logger.catch
     def CreateOrder(self) -> tuple:

diff --git a/util/Task/__init__.py b/util/Task/__init__.py
@@ -356,14 +356,19 @@ def QueryTicketAction(self) -> None:
         等待余票
         """
         logger.info("【获取票数】正在蹲票...")
-        code, msg, clickable, saleable = self.api.QueryAmount()
-        self.queryTicketCode = clickable or saleable
+        code, msg, clickable, salenum = self.api.QueryAmount()
+        self.queryTicketCode = clickable or salenum != 4  # 2: 可售 4: 已售罄 8: 暂时售罄
 
         match code:
             # 成功
             case 0:
                 if self.queryTicketCode:
-                    logger.success("【等待余票】当前可购买")
+                    if salenum == 2:
+                        logger.success("【等待余票】当前可购买")
+                    elif salenum == 8:
+                        logger.warning("【等待余票】暂时售罄")
+                    else:
+                        logger.warning("【等待余票】未知num! 请提交给开发者")
                 else:
                     logger.warning("【等待余票】当前无票, 系统正在循环蹲票中! 请稍后")
                     # 刷新