This commit is contained in:
zlwu committed 2026-05-25 17:43:49 +08:00
1 parent 771f010a39
commit ee4abd361e
102 files changed
+8021 -4094

No files matched your search

+42 -13
View File
@@ -1619,6 +1619,7 @@ class TxnRechargeBody(BaseModel):
amount: float = Field(..., gt=0, alias="amount")
remark: Optional[str] = Field(None, alias="remark")
finance_submit_attachments: Optional[str] = Field(None, alias="financeSubmitAttachments")
class TxnRefundBody(BaseModel):
@@ -1654,6 +1655,14 @@ class TxnUnsubscribeBody(BaseModel):
remark: Optional[str] = Field(None, alias="remark")
class TxnUpdateBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
amount: Optional[float] = Field(None, gt=0, alias="amount")
remark: Optional[str] = Field(None, alias="remark")
finance_submit_attachments: Optional[str] = Field(None, alias="financeSubmitAttachments")
class TxnFinanceSubmitBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
@@ -1933,6 +1942,7 @@ async def list_service_order_txns(
keyword: Optional[str] = None,
createTimeStart: Optional[str] = Query(None, alias="createTimeStart"),
createTimeEnd: Optional[str] = Query(None, alias="createTimeEnd"),
financeDoneOnly: Optional[bool] = Query(False, alias="financeDoneOnly"),
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
@@ -1945,6 +1955,7 @@ async def list_service_order_txns(
keyword=keyword,
create_time_start=createTimeStart,
create_time_end=createTimeEnd,
finance_done_only=bool(financeDoneOnly),
page=page,
page_size=pageSize,
tenant_no=tenant_no,
@@ -1966,17 +1977,7 @@ async def get_service_order_txn_detail(
txn = ps_svc.get_service_order_txn(db, txn_id, tenant_no=tenant_no)
if not txn:
return error_response(404, "流水不存在")
txn_dict = ps_svc._row_to_dict_service_order_txn(txn, db, tenant_no)
order = ps_svc.get_service_order(db, txn.service_order_id, tenant_no=tenant_no)
if order:
txn_dict["channelName"] = order.channel_name or ""
txn_dict["orderType"] = order.order_type or ""
user_ids = [x for x in (txn.create_by, txn.finance_submit_by) if x]
name_map = ps_svc._user_nick_name_map(db, user_ids)
txn_dict["createByName"] = name_map.get(txn.create_by or "", "") or (txn.create_by or "")
txn_dict["financeSubmitByName"] = name_map.get(txn.finance_submit_by or "", "") or (
txn.finance_submit_by or ""
)
txn_dict = ps_svc._service_order_txn_to_response_dict(db, txn, tenant_no)
return success_response(txn_dict)
except ValueError as e:
return error_response(400, str(e))
@@ -1996,6 +1997,7 @@ async def create_recharge_txn(
order_id,
amount=body.amount,
remark=body.remark,
finance_submit_attachments=body.finance_submit_attachments,
tenant_no=tenant_no,
user_id=user.get("user_id"),
)
@@ -2080,6 +2082,31 @@ async def create_unsubscribe_txn(
return error_response(400, str(e))
@router.put("/channel-service-order-txns/{txn_id}")
async def update_service_order_txn(
txn_id: str,
body: TxnUpdateBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
try:
tenant_no = _get_tenant_no(db, user)
txn = ps_svc.update_service_order_txn(
db,
txn_id,
amount=body.amount,
remark=body.remark,
finance_submit_attachments=body.finance_submit_attachments,
tenant_no=tenant_no,
user_id=user.get("user_id"),
)
return success_response(
ps_svc._row_to_dict_service_order_txn(txn, db, tenant_no), message="更新成功"
)
except ValueError as e:
return error_response(400, str(e))
@router.post("/channel-service-order-txns/{txn_id}/submit-finance")
async def submit_txn_finance(
txn_id: str,
@@ -2122,7 +2149,8 @@ async def confirm_txn(
user_id=user.get("user_id"),
)
return success_response(
ps_svc._row_to_dict_service_order_txn(txn, db, tenant_no), message="财务确认成功"
ps_svc._service_order_txn_to_response_dict(db, txn, tenant_no),
message="财务确认成功",
)
except ValueError as e:
return error_response(400, str(e))
@@ -2143,7 +2171,8 @@ async def void_txn(
user_id=user.get("user_id"),
)
return success_response(
ps_svc._row_to_dict_service_order_txn(txn, db, tenant_no), message="作废成功"
ps_svc._service_order_txn_to_response_dict(db, txn, tenant_no),
message="作废成功",
)
except ValueError as e:
return error_response(400, str(e))