场贩添加

Author: mikumifa

tab/settings.py

@@ -99,21 +99,25 @@ def on_submit_ticket_id(num):
         sales_dates_show = len(data["sales_dates"]) != 0
         for item in data["screen_list"]:
             item["project_id"] = data["id"]
-        # 场贩
-        # good_list = util.main_request.get(
-        #     url=f"https://show.bilibili.com/api/ticket/project/getV2?id={project_id}&project_id={project_id}"
-        # )
-        # good_list = good_list.json()
-        # ids = [item["id"] for item in good_list["data"]["list"]]
-        # for id in ids:
-        #     good_detail = util.main_request.get(
-        #         url=f"https://show.bilibili.com/api/ticket/linkgoods/detail?link_id={id}"
-        #     )
-        #     good_detail = good_detail.json()
-        #     for item in good_detail["data"]["specs_list"]:
-        #         item["project_id"] = good_detail["data"]["item_id"]
-        #         item["link_id"] = id
-        #     data["screen_list"] += good_detail["data"]["specs_list"]
+
+        try:
+            good_list = util.main_request.get(
+                url=f"https://show.bilibili.com/api/ticket/linkgoods/list?project_id={project_id}&page_type=0"
+            )
+            good_list = good_list.json()
+            ids = [item["id"] for item in good_list["data"]["list"]]
+            for id in ids:
+                good_detail = util.main_request.get(
+                    url=f"https://show.bilibili.com/api/ticket/linkgoods/detail?link_id={id}"
+                )
+                good_detail = good_detail.json()
+                for item in good_detail["data"]["specs_list"]:
+                    item["project_id"] = good_detail["data"]["item_id"]
+                    item["link_id"] = id
+                data["screen_list"] += good_detail["data"]["specs_list"]
+        except Exception as e:
+            logger.warning(f"获取场贩商品信息出错: {e}")
+
         for screen in data["screen_list"]:
             screen_name = screen["name"]
             screen_id = screen["id"]

task/buy.py

@@ -92,10 +92,10 @@ def buy_stream(
         try:
             yield "1）订单准备"
             if is_hot_project:
-                ctoken_generator = CTokenGenerator(
-                    time.time(), 0, randint(2000, 10000)
+                ctoken_generator = CTokenGenerator(time.time(), 0, randint(2000, 10000))
+                token_payload["token"] = ctoken_generator.generate_ctoken(
+                    is_create_v2=False
                 )
-                token_payload["token"] = ctoken_generator.generate_ctoken(is_create_v2=False)
             request_result_normal = _request.post(
                 url=f"{base_url}/api/ticket/order/prepare?project_id={tickets_info['project_id']}",
                 data=token_payload,
@@ -110,7 +110,7 @@ def buy_stream(
             payload = tickets_info
             if "detail" in payload:
                 del payload["detail"]
-            
+
             result = None
             for attempt in range(1, 61):
                 if not isRunning:
@@ -119,7 +119,9 @@ def buy_stream(
                 try:
                     url = f"{base_url}/api/ticket/order/createV2?project_id={tickets_info['project_id']}"
                     if is_hot_project:
-                        payload["ctoken"] = ctoken_generator.generate_ctoken(is_create_v2=True)
+                        payload["ctoken"] = ctoken_generator.generate_ctoken(
+                            is_create_v2=True
+                        )  # type: ignore
                         payload["ptoken"] = request_result["data"]["ptoken"]
                         payload["orderCreateUrl"] = (
                             "https://show.bilibili.com/api/ticket/order/createV2"