tomoya 1 anno fa
parent
commit
ad64c49487
1 ha cambiato i file con 41 aggiunte e 38 eliminazioni
  1. 41 38
      backend/app/app/api/api_v1/endpoints/payment.py

+ 41 - 38
backend/app/app/api/api_v1/endpoints/payment.py

@@ -1,7 +1,7 @@
-from typing import Any, List
+from typing import Any, List, Optional
 from datetime import datetime
 
-from fastapi import APIRouter, Body, Depends, HTTPException, Form
+from fastapi import APIRouter, Body, Depends, HTTPException, Form, status, Response
 from fastapi.encoders import jsonable_encoder
 from pydantic.networks import EmailStr
 from sqlalchemy.orm import Session
@@ -15,7 +15,7 @@ from app.utils import send_new_account_email
 router = APIRouter()
 
 @router.post("/ecpayTestPay", response_model=str)
-def create_user(
+def ecpay(
     *,
     db: Session = Depends(deps.get_db),
     current_user: models.User = Depends(deps.get_current_active_user),
@@ -132,40 +132,43 @@ def create_user(
         print('An exception happened: ' + str(error))
         
 @router.post("/ecpayTestReturn")
-def create_user(
+def ecpay_return(
     *,
-    MerchantID: str=Form(),
-    MerchantTradeNo: str=Form(),
-    StoreID: str=Form(),
-    RtnCode: int=Form(),
-    RtnMsg: str=Form(),
-    TradeNo: str=Form(),
-    TradeAmt: int=Form(),
-    PaymentDate: str=Form(),
-    PaymentType: str=Form(),
-    PaymentTypeChargeFee: str=Form(),
-    TradeDate: str=Form(),
-    SimulatePaid: int=Form(),
-    CustomField1: str=Form(),
-    CustomField2: str=Form(),
-    CustomField3: str=Form(),
-    CustomField4: str=Form(),
-    CheckMacValue: str=Form(),
+    MerchantID: Optional[str]=Form(None),
+    MerchantTradeNo: Optional[str]=Form(None),
+    StoreID: Optional[str]=Form(None),
+    RtnCode: Optional[int]=Form(None),
+    RtnMsg: Optional[str]=Form(None),
+    TradeNo: Optional[str]=Form(None),
+    TradeAmt: Optional[int]=Form(None),
+    PaymentDate: Optional[str]=Form(None),
+    PaymentType: Optional[str]=Form(None),
+    PaymentTypeChargeFee: Optional[int]=Form(None),
+    TradeDate: Optional[str]=Form(None),
+    SimulatePaid: Optional[int]=Form(None),
+    CustomField1: Optional[str]=Form(None),
+    CustomField2: Optional[str]=Form(None),
+    CustomField3: Optional[str]=Form(None),
+    CustomField4: Optional[str]=Form(None),
+    CheckMacValue: Optional[str]=Form(None),
 ) -> Any:
-  print(f"MerchantID: {MerchantID} \n \
-          MerchantTradeNo: {MerchantTradeNo}\n \
-          StoreID: {StoreID}\n \
-          RtnCode: {RtnCode}\n \
-          RtnMsg: {RtnMsg}\n \
-          TradeNo: {TradeNo}\n \
-          TradeAmt: {TradeAmt}\n \
-          PaymentDate: {PaymentDate}\n \
-          PaymentType: {PaymentType}\n \
-          PaymentTypeChargeFee: {PaymentTypeChargeFee}\n \
-          TradeDate: {TradeDate}\n \
-          SimulatePaid: {SimulatePaid}\n \
-          CustomField1: {CustomField1}\n \
-          CustomField2: {CustomField2}\n \
-          CustomField3: {CustomField3}\n \
-          CustomField4: {CustomField4}\n \
-          CheckMacValue: {CheckMacValue}")
+  print(f"\
+MerchantID: {MerchantID} \n\
+MerchantTradeNo: {MerchantTradeNo}\n\
+StoreID: {StoreID}\n\
+RtnCode: {RtnCode}\n\
+RtnMsg: {RtnMsg}\n\
+TradeNo: {TradeNo}\n\
+TradeAmt: {TradeAmt}\n\
+PaymentDate: {PaymentDate}\n\
+PaymentType: {PaymentType}\n\
+PaymentTypeChargeFee: {PaymentTypeChargeFee}\n\
+TradeDate: {TradeDate}\n\
+SimulatePaid: {SimulatePaid}\n\
+CustomField1: {CustomField1}\n\
+CustomField2: {CustomField2}\n\
+CustomField3: {CustomField3}\n\
+CustomField4: {CustomField4}\n\
+CheckMacValue: {CheckMacValue}\
+  ")
+  return Response(content='1', status_code=status.HTTP_200_OK)