refactor: 重新设计简书积分兑换平台相关模块

FHU-yezi · Jan 29, 2025 · 5e11523 · 5e11523
1 parent 9d46829
commit 5e11523
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 37 deletions.
diff --git a/jkit/jpep/ftn_macket.py b/jkit/jpep/ftn_macket.py
@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from collections.abc import AsyncGenerator
-from enum import Enum
 from typing import Literal
 
 from jkit._base import DataObject, ResourceObject
@@ -15,58 +14,60 @@
     PositiveInt,
 )
 
+FtnMarketOrderSupportedPaymentChannelsType = Literal[
+    "WECHAT_PAY", "ALIPAY", "ANT_CREDIT_PAY"
+]
 
-class PaymentChannels(Enum):
-    WECHAT_PAY = "微信支付"
-    ALIPAY = "支付宝"
-    ANT_CREDIT_PAY = "蚂蚁花呗"
 
-
-class PublisherInfoField(DataObject, frozen=True):
+class _PublisherInfoField(DataObject, frozen=True):
     id: PositiveInt
     name: NonEmptyStr
+
     hashed_name: NonEmptyStr
     avatar_url: NonEmptyStr | None
     credit: NonNegativeInt
 
 
-class FTNMacketOrderRecord(DataObject, frozen=True):
+class FtnMacketOrderData(DataObject, frozen=True):
     id: PositiveInt
-    price: PositiveFloat
 
+    price: PositiveFloat
     total_amount: PositiveInt
     traded_amount: NonNegativeInt
     tradable_amount: NonNegativeInt
     minimum_trade_amount: PositiveInt
 
-    traded_count: NonNegativeInt
+    completed_trades_count: NonNegativeInt
     publish_time: NormalizedDatetime
-    supported_payment_channels: tuple[PaymentChannels, ...]
+    supported_payment_channels: tuple[FtnMarketOrderSupportedPaymentChannelsType, ...]
 
-    publisher_info: PublisherInfoField
+    publisher_info: _PublisherInfoField
 
 
-class FTNMacket(ResourceObject):
+class FtnMacket(ResourceObject):
     async def iter_orders(
         self,
         *,
         type: Literal["BUY", "SELL"],
         start_page: int = 1,
-    ) -> AsyncGenerator[FTNMacketOrderRecord, None]:
-        now_page = start_page
+    ) -> AsyncGenerator[FtnMacketOrderData, None]:
+        current_page = start_page
+
         while True:
             data = await send_request(
                 datasource="JPEP",
                 method="POST",
-                # TODO
-                path=f"/getList/furnish.bei/?page={now_page}",
+                path=f"/getList/furnish.bei/?page={current_page}",
+                params={"page": current_page},
                 body={
                     "filter": [
+                        # 0：卖单 1：买单
                         {"trade": 1 if type == "BUY" else 0},
                         {"status": 1},
                         {"finish": 0},
                         {"tradable": {">": "0"}},
                     ],
+                    # 买单价格正序，卖单价格倒序
                     "sort": "price,pub_date" if type == "BUY" else "-price,pub_date",
                     "bind": [
                         {
@@ -89,34 +90,37 @@ async def iter_orders(
                 break
 
             for item in data["data"]:
-                yield FTNMacketOrderRecord(
+                item_user = item["member.user"][0]
+
+                yield FtnMacketOrderData(
                     id=item["id"],
                     price=item["price"],
                     total_amount=item["totalNum"],
                     traded_amount=item["tradeNum"],
                     tradable_amount=item["tradable"],
                     minimum_trade_amount=item["minNum"],
-                    traded_count=item["tradeCount"],
+                    completed_trades_count=item["tradeCount"],
                     publish_time=normalize_datetime(item["pub_date"]),
+                    # TODO: 优化类型检查
                     supported_payment_channels=tuple(
                         {
-                            1: PaymentChannels.WECHAT_PAY,
-                            2: PaymentChannels.ALIPAY,
-                            3: PaymentChannels.ANT_CREDIT_PAY,
+                            1: "WECHAT_PAY",
+                            2: "ALIPAY",
+                            3: "ANT_CREDIT_PAY",
                         }[int(x)]
-                        for x in item["member.user"][0]["pay_types"].split("|")
+                        for x in item_user["pay_types"].split("|")
                     )
-                    if item["member.user"][0]["pay_types"]
-                    else (),
-                    publisher_info=PublisherInfoField(
-                        id=item["member.user"][0]["id"],
-                        name=item["member.user"][0]["username"],
-                        hashed_name=item["member.user"][0]["username_md5"],
-                        avatar_url=item["member.user"][0]["avatarUrl"]
-                        if item["member.user"][0]["avatarUrl"]
+                    if item_user["pay_types"]
+                    else (),  # type: ignore
+                    publisher_info=_PublisherInfoField(
+                        id=item_user["id"],
+                        name=item_user["username"],
+                        hashed_name=item_user["username_md5"],
+                        avatar_url=item_user["avatarUrl"]
+                        if item_user["avatarUrl"]
                         else None,
-                        credit=item["member.user"][0]["credit"],
+                        credit=item_user["credit"],
                     ),
                 )._validate()
 
-            now_page += 1
+            current_page += 1
diff --git a/jkit/jpep/platform_settings.py → jkit/jpep/rules.py b/jkit/jpep/platform_settings.py → jkit/jpep/rules.py
@@ -3,7 +3,7 @@
 from jkit.constraints import NonNegativeFloat
 
 
-class PlatformSettingsData(DataObject, frozen=True):
+class RulesData(DataObject, frozen=True):
     opening: bool
 
     ftn_trade_fee: NonNegativeFloat
@@ -13,8 +13,8 @@ class PlatformSettingsData(DataObject, frozen=True):
     ftn_sell_trade_minimum_price: NonNegativeFloat
 
 
-class PlatformSettings(ResourceObject):
-    async def get_data(self) -> PlatformSettingsData:
+class Rules(ResourceObject):
+    async def get_rules(self) -> RulesData:
         data = await send_request(
             datasource="JPEP",
             method="POST",
@@ -23,7 +23,7 @@ async def get_data(self) -> PlatformSettingsData:
             response_type="JSON",
         )
 
-        return PlatformSettingsData(
+        return RulesData(
             opening=not bool(data["data"]["isClose"]),
             ftn_trade_fee=data["data"]["fee"],
             goods_trade_fee=data["data"]["shop_fee"],