flight-helper 0.1.7__py3-none-any.whl → 0.2.6__py3-none-any.whl

flight_helper/models/dto/booking.py

@@ -11,7 +11,7 @@
 """
 from typing import Optional
 from flight_helper.validator.type_validator import parse_to_date_str
-from pydantic import BaseModel, model_validator, PositiveInt, PositiveFloat, NonNegativeFloat, Field, field_validator
+from pydantic import BaseModel, model_validator, PositiveInt, PositiveFloat, NonPositiveFloat, Field, field_validator
 
 
 class BookingInputDTO(BaseModel):
@@ -26,16 +26,16 @@ class BookingInputDTO(BaseModel):
     product_type: str = Field(..., description="产品类型，如：经济舱、超级经济舱等")
     product_name: Optional[str] = Field(default=None, description="产品名称，如：C919特惠，老年特惠")
 
-    sale_increase_threshold: Optional[NonNegativeFloat] = Field(
+    sale_increase_threshold: Optional[NonPositiveFloat] = Field(
         default=0.00, description="涨价上限（相对于 sale_price 的绝对值或百分比？按业务定）"
     )
-    sale_reduction_threshold: Optional[NonNegativeFloat] = Field(
+    sale_reduction_threshold: Optional[NonPositiveFloat] = Field(
         default=0.00, description="降价上限（相对于 sale_price 的绝对值或百分比？按业务定）"
     )
-    standard_increase_threshold: Optional[NonNegativeFloat] = Field(
+    standard_increase_threshold: Optional[NonPositiveFloat] = Field(
         default=0.00, description="涨价上限（相对于 standard_price 的绝对值或百分比？按业务定）"
     )
-    standard_reduction_threshold: Optional[NonNegativeFloat] = Field(
+    standard_reduction_threshold: Optional[NonPositiveFloat] = Field(
         default=0.00, description="降价上限（相对于 standard_price 的绝对值或百分比？按业务定）"
     )
 

flight_helper/models/dto/itinerary.py

@@ -9,9 +9,8 @@
 # Copyright ©2011-2026. Hunan xxxxxxx Company limited. All rights reserved.
 # ---------------------------------------------------------------------------------------------------------
 """
-from aiohttp import CookieJar
 from typing import Optional, List, Dict, Any
-from pydantic import BaseModel, NonNegativeFloat, Field, field_validator
+from pydantic import BaseModel, NonPositiveFloat, Field, field_validator
 
 
 class ItineraryInfoDTO(BaseModel):
@@ -26,7 +25,7 @@ class QueryItineraryResponseDTO(BaseModel):
     order_no: Optional[str] = Field(default=None, description="业务平台订单号")
     pre_order_no: str = Field(..., description="采购平台订单号")
     order_status: Optional[str] = Field(default=None, description="采购平台订单状态")
-    order_amount: Optional[NonNegativeFloat] = Field(default=None, description="采购平台订单金额")
+    order_amount: Optional[NonPositiveFloat] = Field(default=None, description="采购平台订单金额")
     cash_unit: Optional[str] = Field(default=None, description="采购金额的币种")
     itinerary_info: List[ItineraryInfoDTO] = Field(..., description="乘客行程单信息")
 

flight_helper/models/dto/passenger.py

@@ -14,10 +14,7 @@ from pydantic import BaseModel, Field, PositiveInt
 
 
 class PassengerDTO(BaseModel):
-    passenger_id: Optional[str] = Field(default=None, description="乘客ID")
     segment_index: PositiveInt = Field(..., description="航段索引")
-    flight_id: Optional[str] = Field(default=None, description="航班ID")
-    table_id: Optional[str] = Field(default=None, description="乘客制表ID")
     # 乘客基本信息
     passenger_type: Literal["成人", "儿童", "婴儿"] = Field(
         ..., description="乘客类型，必须是：成人、儿童 或 婴儿"
@@ -25,14 +22,17 @@ class PassengerDTO(BaseModel):
     passenger_name: str = Field(
         ..., description="乘客法定姓名（按证件填写），如：Zhang San 或 张三"
     )
-    passenger_alias: Optional[str] = Field(
-        default=None,
-        description="乘客中文常用名（仅外国人使用），如：汤姆（对应 Tom）"
-    )
-
     # 性别与证件
     gender: Literal["男", "女"] = Field(..., description='性别，只能是"男"或"女"')
     id_type: Literal["身份证", "港澳通行证", "护照", "军官证", "回乡证"] = Field(
         ..., description='证件类型'
     )
     id_number: str = Field(..., description="证件号码（按证件如实填写）")
+
+    passenger_id: Optional[str] = Field(default=None, description="乘客ID")
+    flight_id: Optional[str] = Field(default=None, description="乘客航段ID")
+    table_id: Optional[str] = Field(default=None, description="乘客制表ID")
+    passenger_alias: Optional[str] = Field(
+        default=None,
+        description="乘客中文常用名（仅外国人使用），如：汤姆（对应 Tom）"
+    )

flight_helper/models/dto/payment.py

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 from typing import Literal, Optional, Union, Annotated
-from pydantic import BaseModel, Field, TypeAdapter, NonNegativeFloat
+from pydantic import BaseModel, Field, TypeAdapter, NonPositiveFloat
 
 SupportedChannels = Literal["微信", "支付宝", "汇付天下", "易宝支付"]
 
@@ -26,7 +26,7 @@ class PaymentResultDTO(__BasePaymentDTO):
     order_no: str = Field(..., description="报表平台订单号")
     pre_order_no: Optional[str] = Field(default=None, description="采购平台订单号")
     pay_transaction: Optional[str] = Field(default=None, description="支付流水")
-    pay_amount: Optional[NonNegativeFloat] = Field(default=None, description="支付金额")
+    pay_amount: Optional[NonPositiveFloat] = Field(default=None, description="支付金额")
 
 
 class __BasePaymentInputDTO(__BasePaymentDTO):

flight_helper/models/dto/procurement.py

@@ -10,7 +10,7 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 from typing import Optional, List, Literal
-from pydantic import BaseModel, PositiveInt, NegativeFloat, Field
+from pydantic import BaseModel, PositiveInt, PositiveFloat, Field
 
 
 class ProcurementInputDTO(BaseModel):
@@ -18,37 +18,37 @@ class ProcurementInputDTO(BaseModel):
     pl_domain: str = Field(..., description="平台域名，例如：www.ceair.com")
     pl_protocol: str = Field(..., description="平台协议，例如：https")
     out_ticket_platform_type: str = Field(..., description="出票平台类型")
-    out_ticket_platform_type_id: int = Field(..., description="出票平台类型ID")
     out_ticket_platform: str = Field(..., description="出票平台")
-    account_number: str = Field(..., description="出票账号", alias="out_ticket_account")
-
-    type_name: str = Field(..., description="采购账号类型", alias="purchase_account_type")
-    account_id: str = Field(..., description="采购账号ID", alias="purchase_account_id")
-    account_name: str = Field(..., description="采购账号", alias="purchase_account")
-
+    account_number: str = Field(..., description="出票账号")
+    type_name: str = Field(..., description="采购账号类型")
+    purchase_account: str = Field(..., description="采购账号")
     remark: str = Field(..., description="备注，一般是由采购平台账号 + 账号密码拼接而成")
 
-    out_ticket_account: str = Field(..., description="账号", alias="account")
-    out_ticket_account_id: int = Field(..., description="账号ID")
-    out_ticket_account_pawword: str = Field(..., description="密码", alias="pawword")
-
-    out_ticket_mobile: str = Field(..., description="出票手机，退改业务需要根据此手机号码来进行操作")
+    out_ticket_account: Optional[str] = Field(default=None, description="账号")
+    out_ticket_account_id: Optional[int] = Field(default=None, description="账号ID")
+    out_ticket_account_password: Optional[str] = Field(default=None, description="密码")
+    purchase_account_id: Optional[int] = Field(default=None, description="采购账号ID")
+    out_ticket_platform_type_id: Optional[int] = Field(default=None, description="出票平台类型ID")
+    out_ticket_mobile: Optional[str] = Field(default=None, description="出票手机，退改业务需要根据此手机号码来进行操作")
 
 
 class ProcurementReusltDTO(BaseModel):
     # 平台信息
     order_no: PositiveInt = Field(..., description="订单号")
-    transaction_amount: NegativeFloat = Field(..., description="采购金额", alias="purchase_amount")
-    segment_index: Optional[int] = Field(default=None, description="采购航段")
-    passenger_names: Optional[List[str]] = Field(default=None, description="采购乘客")
+    air_co_order_id: str = Field(..., description="官网订单号")
+    transaction_amount: PositiveFloat = Field(..., description="采购金额")
     passenger_type: Literal["成人", "儿童", "婴儿"] = Field(
         ..., description="乘客类型，必须是：成人、儿童 或 婴儿"
     )
-    flight_ids: Optional[List[str]] = Field(default=None, description="航班ID列表")
+
+    passenger_names: Optional[List[str]] = Field(default=None, description="采购乘客")
+    segment_index: Optional[PositiveInt] = Field(default=None, description="航段索引")
+    flight_ids: Optional[str] = Field(default=None, description="乘客航段ID")
     passenger_ids: Optional[List[str]] = Field(default=None, description="乘客ID列表")
     pay_transaction: Optional[str] = Field(default=None, description="对账标识")
-    air_co_order_id: str = Field(..., description="官网订单号")
 
 
 class FillProcurementInputDTO(ProcurementInputDTO, ProcurementReusltDTO):
-    pass
+    order_no: Optional[PositiveInt] = Field(default=None, description="订单号")
+    transaction_amount: Optional[PositiveFloat] = Field(default=None, description="采购金额")
+    air_co_order_id: Optional[str] = Field(default=None, description="官网订单号")

{flight_helper-0.1.7.dist-info → flight_helper-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flight_helper
-Version: 0.1.7
+Version: 0.2.6
 Summary: flight helper python package
 Author-email: ckf10000 <ckf10000@sina.com>
 License:                                  Apache License

flight_helper-0.2.6.dist-info/RECORD

@@ -0,0 +1,15 @@
+flight_helper/__init__.py,sha256=thrHOfIzem5D1k7RU4iPbsWOZJDhxvdDnJ_wuOrDZ30,475
+flight_helper/models/__init__.py,sha256=58ly88YaKqeLEuPfKWB02-WZqxLaWHfqLGlH77DrF8g,475
+flight_helper/models/dto/__init__.py,sha256=pCL0j7uw5uVeJOcdPos4Ax7Xr6B85rWHPVP8hQ3WxR4,484
+flight_helper/models/dto/booking.py,sha256=3FesVrjErQlzBaIOpZ6FjmBT9DfjDhUGUD6QIrOcS_E,4287
+flight_helper/models/dto/itinerary.py,sha256=cWBt4ZSUUvyaNRYPnRLyN5G76Ell8jlYysSbO6CDw0k,2948
+flight_helper/models/dto/passenger.py,sha256=UkJ9abRXZ3WhwLC0-cxbQ8jAkh1dadd4rin2gZEb2G4,1765
+flight_helper/models/dto/payment.py,sha256=soLXsVznzKDwcDtawPP-OtbLIUfSjmVPk4XfR25pZ-Y,4249
+flight_helper/models/dto/procurement.py,sha256=JV6xOcvHwjX-ZVJiZTbzbfQfudjIfbo0o4BVOe3RD7U,3147
+flight_helper/validator/__init__.py,sha256=Eh60SrFKSaYwcOwLEn3z2lbxfmLUTjWgZR2B7yC-34c,478
+flight_helper/validator/type_validator.py,sha256=CmXMIENl_1hqzN27pmXnS6hniXrN_hjfWnDKobmowWc,1128
+flight_helper-0.2.6.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+flight_helper-0.2.6.dist-info/METADATA,sha256=4DHcDDGPTR-vLQ_uk9LZpN1dDc72TH4Jz9qFfqU_U-s,14323
+flight_helper-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flight_helper-0.2.6.dist-info/top_level.txt,sha256=UcuL9Tgenq0in0bIdaANexg1HVpkOnRuvBN0iSaB2Nc,14
+flight_helper-0.2.6.dist-info/RECORD,,

flight_helper-0.1.7.dist-info/RECORD

@@ -1,15 +0,0 @@
-flight_helper/__init__.py,sha256=thrHOfIzem5D1k7RU4iPbsWOZJDhxvdDnJ_wuOrDZ30,475
-flight_helper/models/__init__.py,sha256=58ly88YaKqeLEuPfKWB02-WZqxLaWHfqLGlH77DrF8g,475
-flight_helper/models/dto/__init__.py,sha256=pCL0j7uw5uVeJOcdPos4Ax7Xr6B85rWHPVP8hQ3WxR4,484
-flight_helper/models/dto/booking.py,sha256=cgWlB-0q3szAjEBHYLqxSehchAXWnGyFBEpGU0k9F7U,4287
-flight_helper/models/dto/itinerary.py,sha256=-BaymWWSO6Ukra2P-DzOn1tv4djx2ewYoSdytnPAOT8,2979
-flight_helper/models/dto/passenger.py,sha256=KXCDjdagIY6e_J7EidVlYtBXg66P3J28gq5oqG1NErk,1759
-flight_helper/models/dto/payment.py,sha256=bM2FoE9k5gPInz_xyot8JKEUrrr_N2r12oJx1TDtCbM,4249
-flight_helper/models/dto/procurement.py,sha256=k_c5wOxPyWsxB3NUvXnuBYD0_P7Ehb9yInDSHNjvO7M,2932
-flight_helper/validator/__init__.py,sha256=Eh60SrFKSaYwcOwLEn3z2lbxfmLUTjWgZR2B7yC-34c,478
-flight_helper/validator/type_validator.py,sha256=CmXMIENl_1hqzN27pmXnS6hniXrN_hjfWnDKobmowWc,1128
-flight_helper-0.1.7.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
-flight_helper-0.1.7.dist-info/METADATA,sha256=6hDKwrIOgjmR1QRm747HQbp_rGS_EcFcFy7pbrdNdTo,14323
-flight_helper-0.1.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flight_helper-0.1.7.dist-info/top_level.txt,sha256=UcuL9Tgenq0in0bIdaANexg1HVpkOnRuvBN0iSaB2Nc,14
-flight_helper-0.1.7.dist-info/RECORD,,