|
@@ -91,12 +91,12 @@ class OpenTransferService:
|
|
|
log.info("回调通知: 未配置回调地址, tenant_id={}", auth.tenant_id)
|
|
log.info("回调通知: 未配置回调地址, tenant_id={}", auth.tenant_id)
|
|
|
return False
|
|
return False
|
|
|
|
|
|
|
|
- result = TransferOutSchema.model_validate(transfer).model_dump(exclude_none=True)
|
|
|
|
|
- result["third_biz_no"] = open_data.third_biz_no
|
|
|
|
|
|
|
+ result = TransferOutSchema.model_validate(transfer)
|
|
|
|
|
+ result.third_biz_no = open_data.third_biz_no
|
|
|
|
|
|
|
|
notify_id = f"n{get_snowflake_id()}"
|
|
notify_id = f"n{get_snowflake_id()}"
|
|
|
timestamp = int(time.time() * 1000)
|
|
timestamp = int(time.time() * 1000)
|
|
|
- content = json.dumps(result)
|
|
|
|
|
|
|
+ content = result.model_dump_json(exclude_none=True)
|
|
|
|
|
|
|
|
timeout = aiohttp.ClientTimeout(total=30)
|
|
timeout = aiohttp.ClientTimeout(total=30)
|
|
|
async with aiohttp.ClientSession(timeout=timeout) as session:
|
|
async with aiohttp.ClientSession(timeout=timeout) as session:
|
|
@@ -123,9 +123,9 @@ class OpenTransferService:
|
|
|
raise CustomException("三方订单号不存在")
|
|
raise CustomException("三方订单号不存在")
|
|
|
|
|
|
|
|
result = await AccountService.transfer_detail_service(auth=auth, out_biz_no=transfer_data.out_biz_no)
|
|
result = await AccountService.transfer_detail_service(auth=auth, out_biz_no=transfer_data.out_biz_no)
|
|
|
- result_dict = result.model_dump(exclude_none=True)
|
|
|
|
|
- result_dict.update({"third_biz_no": transfer_data.third_biz_no})
|
|
|
|
|
- return result_dict
|
|
|
|
|
|
|
+ result.third_biz_no = transfer_data.third_biz_no
|
|
|
|
|
+
|
|
|
|
|
+ return result.model_dump(exclude_none=True)
|
|
|
|
|
|
|
|
@classmethod
|
|
@classmethod
|
|
|
async def open_transfer_service(
|
|
async def open_transfer_service(
|