flight-helper 0.0.6__py3-none-any.whl → 0.1.3__py3-none-any.whl

flight_helper/models/dto/booking.py

@@ -46,6 +46,7 @@ class BookingInputDTO(BaseModel):
 
 
 class OneWayBookingDTO(BaseModel):
+    order_no: str = Field(..., description="报表平台的订单号")
     # 航班信息
     dep_city: str = Field(..., description="起飞城市（中文）")
     arr_city: str = Field(..., description="抵达城市（中文）")

flight_helper/models/dto/itinerary.py

@@ -32,7 +32,7 @@ class QueryItineraryResponseDTO(BaseModel):
 
     @field_validator("itinerary_info")
     @classmethod
-    def validate_non_empty(cls, info, v: List[ItineraryInfoDTO]):
+    def validate_non_empty(cls, v: List[ItineraryInfoDTO], info):
         if len(v) == 0:
             raise ValueError("至少需要一个乘客行程")
         # 获取外层的 pre_order_no
@@ -55,4 +55,3 @@ class QueryItineraryRequestDTO(BaseModel):
     user_id: Optional[str] = Field(default=None, description="采购平台登录用户的ID")
     proxy: Optional[Dict[str, Any]] = Field(default=None, description="http的代理配置")
     headers: Optional[Dict[str, Any]] = Field(default=None, description="自定义的http headers")
-    cookie_jar: Optional[CookieJar] = Field(default=None, description="自定义的CookieJar对象")

flight_helper/models/dto/passenger.py

@@ -10,10 +10,14 @@
 # ---------------------------------------------------------------------------------------------------------
 """
 from typing import Optional, Literal
-from pydantic import BaseModel, Field
+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="乘客类型，必须是：成人、儿童 或 婴儿"

flight_helper/models/dto/payment.py

@@ -16,22 +16,25 @@ SupportedChannels = Literal["微信", "支付宝", "汇付天下", "易宝支付
 
 
 class __BasePaymentDTO(BaseModel):
-    pay_domain: Optional[str] = Field(default=None, description="支付在线收银台域名，例如：www.ceair.com")
-    pay_protocol: Optional[str] = Field(default=None, description="支付在线收银台协议，例如：https")
-
-    channel_name: SupportedChannels = Field(
-        ..., description=f'支付渠道，只能是其中之一：{SupportedChannels}'
-    )
+    channel_name: SupportedChannels = Field(..., description=f'支付渠道，只能是其中之一：{SupportedChannels}')
     payment_type: str = Field(..., description="支付方式")
-    order_no: str = Field(..., description="报表平台订单号")
-    pre_order_no: Optional[str] = Field(default=None, description="采购平台订单号")
     account: Optional[str] = Field(default=None, description="支付账号")
     password: Optional[str] = Field(default=None, description="账号密码")
+
+
+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="支付金额")
 
 
-class YBAccountPaymentDTO(__BasePaymentDTO):
+class __BasePaymentInputDTO(__BasePaymentDTO):
+    pay_domain: Optional[str] = Field(default=None, description="支付在线收银台域名，例如：www.ceair.com")
+    pay_protocol: Optional[str] = Field(default=None, description="支付在线收银台协议，例如：https")
+
+
+class YBAccountPaymentInputDTO(__BasePaymentInputDTO):
     """易宝支付-账号支付"""
     channel_name: Literal["易宝支付"] = Field(..., description="支付渠道")
     payment_type: Literal["账户支付"] = Field(..., description="支付方式")
@@ -39,17 +42,17 @@ class YBAccountPaymentDTO(__BasePaymentDTO):
     password: str = Field(..., description="账号密码")
 
 
-class WeChatPaymentDTO(__BasePaymentDTO):
+class WeChatPaymentInputDTO(__BasePaymentInputDTO):
     channel_name: Literal["微信"] = Field(..., description="支付渠道")
     payment_type: Literal["二维码识别"] = Field(..., description="支付方式")
 
 
-class AlipayPaymentDTO(__BasePaymentDTO):
+class AlipayPaymentInputDTO(__BasePaymentInputDTO):
     channel_name: Literal["支付宝"] = Field(..., description="支付渠道")
     payment_type: Literal["二维码识别"] = Field(..., description="支付方式")
 
 
-class HFPaidAccountPaymentDTO(__BasePaymentDTO):
+class HFPaidAccountPaymentInputDTO(__BasePaymentInputDTO):
     """汇付天下-付款账户支付"""
     channel_name: Literal["汇付天下"] = Field(..., description="支付渠道")
     payment_type: Literal["付款账户支付"] = Field(..., description="支付方式")
@@ -58,12 +61,12 @@ class HFPaidAccountPaymentDTO(__BasePaymentDTO):
 
 
 # 3. 创建联合类型，并指定 discriminator
-PaymentRuestDTO = Annotated[
+PaymentInputDTO = Annotated[
     Union[
-        YBAccountPaymentDTO,
-        WeChatPaymentDTO,
-        AlipayPaymentDTO,
-        HFPaidAccountPaymentDTO,
+        YBAccountPaymentInputDTO,
+        WeChatPaymentInputDTO,
+        AlipayPaymentInputDTO,
+        HFPaidAccountPaymentInputDTO,
         # TODO ... 其他支付方式
     ],
     Field(discriminator='channel_name')  # 或者用 'payment_type'，看业务
@@ -71,7 +74,7 @@ PaymentRuestDTO = Annotated[
 
 if __name__ == '__main__':
     # 创建适配器
-    adapter = TypeAdapter(PaymentRuestDTO)
+    adapter = TypeAdapter(PaymentInputDTO)
 
     # 测试 1: 易宝支付
     yb_data = {
@@ -81,11 +84,9 @@ if __name__ == '__main__':
         "account": "yb123",
         "password": "pass123"
     }
-    yb = YBAccountPaymentDTO(**yb_data)
-    yb.pay_transaction = "112312"
+    yb = PaymentResultDTO(**yb_data)
     print(yb)
     yb_payment = adapter.validate_python(yb_data)
-    yb_payment.pay_transaction = "123123123"
     print(yb_payment)
     print(type(yb_payment))  # <class '__main__.YBAccountPayment'>
 

flight_helper/models/dto/procurement.py

@@ -22,11 +22,8 @@ class ProcurementInputDTO(BaseModel):
     out_ticket_account: str = Field(..., description="出票账号")
     purchase_account_type: str = Field(..., description="采购账号类型")
     purchase_account: str = Field(..., description="采购账号")
-    purchase_amount: NegativeFloat = Field(..., description="采购金额")
     remark: str = Field(..., description="备注，一般是由采购平台账号 + 账号密码拼接而成")
     out_ticket_mobile: str = Field(..., description="出票手机，退改业务需要根据此手机号码来进行操作")
-    pay_transaction: str = Field(..., description="支付流水")
-    pre_order_no: str = Field(..., description="采购平台订单号")
 
 
 class ProcurementReusltDTO(BaseModel):
@@ -34,3 +31,4 @@ class ProcurementReusltDTO(BaseModel):
     order_no: PositiveInt = Field(..., description="订单号")
     pay_transaction: Optional[str] = Field(default=None, description="支付流水")
     pre_order_no: str = Field(..., description="采购平台订单号")
+    purchase_amount: NegativeFloat = Field(..., description="采购金额")

{flight_helper-0.0.6.dist-info → flight_helper-0.1.3.dist-info}/METADATA

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

flight_helper-0.1.3.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=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=OyoWIr2lQkO6UsyN3I9dPWYUKEy-LAXthReJ40308Rw,1797
+flight_helper/validator/__init__.py,sha256=Eh60SrFKSaYwcOwLEn3z2lbxfmLUTjWgZR2B7yC-34c,478
+flight_helper/validator/type_validator.py,sha256=CmXMIENl_1hqzN27pmXnS6hniXrN_hjfWnDKobmowWc,1128
+flight_helper-0.1.3.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
+flight_helper-0.1.3.dist-info/METADATA,sha256=rpI0bnDfWGlr1m9mSes0Nkk1HA2oIz4AezDlgKqPR_M,14323
+flight_helper-0.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flight_helper-0.1.3.dist-info/top_level.txt,sha256=UcuL9Tgenq0in0bIdaANexg1HVpkOnRuvBN0iSaB2Nc,14
+flight_helper-0.1.3.dist-info/RECORD,,

flight_helper-0.0.6.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=ZsQtwfeItRsJa4VQLwUemWm25ydjKYAApPbuLpoyaSk,4215
-flight_helper/models/dto/itinerary.py,sha256=blc7GSbsqJePHgnAyOClwaPr34fGAtGxRnQw4YvIX8Y,3081
-flight_helper/models/dto/passenger.py,sha256=7Xd2pZp84C303yDwuZtcnpxkY1hi5oxyqd8fIcblYPY,1437
-flight_helper/models/dto/payment.py,sha256=DA17AXlr73_0kU_3aAHwN2sasXzK1RrChYN0dNWu6-E,4192
-flight_helper/models/dto/procurement.py,sha256=UjKhcGvxJuDtLkuzL5MutuAMihGiQwduZNZ40jCVQ_s,1937
-flight_helper/validator/__init__.py,sha256=Eh60SrFKSaYwcOwLEn3z2lbxfmLUTjWgZR2B7yC-34c,478
-flight_helper/validator/type_validator.py,sha256=CmXMIENl_1hqzN27pmXnS6hniXrN_hjfWnDKobmowWc,1128
-flight_helper-0.0.6.dist-info/licenses/LICENSE,sha256=WtjCEwlcVzkh1ziO35P2qfVEkLjr87Flro7xlHz3CEY,11556
-flight_helper-0.0.6.dist-info/METADATA,sha256=KI4tvpqCCh0bo3vyGpcq11W3RLl1Xxf_RJVFUxpEaj4,14323
-flight_helper-0.0.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flight_helper-0.0.6.dist-info/top_level.txt,sha256=UcuL9Tgenq0in0bIdaANexg1HVpkOnRuvBN0iSaB2Nc,14
-flight_helper-0.0.6.dist-info/RECORD,,