优化斗鱼充值

This commit is contained in:
yml2213
2026-08-13 21:43:27 +08:00
parent 902e669614
commit 0bf69c1240
19 changed files with 450 additions and 266 deletions
+53 -7
View File
@@ -1,8 +1,9 @@
"""斗鱼鱼翅充值渠道分流测试。"""
import asyncio
import os
import unittest
from unittest.mock import Mock, patch
from unittest.mock import AsyncMock, Mock, patch
os.environ.setdefault("DATABASE_URL", "sqlite://")
os.environ.setdefault("APP_ENCRYPTION_KEY", "MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWY=")
@@ -12,7 +13,9 @@ from sqlalchemy.orm import sessionmaker
from web.backend.database import Base
from web.backend.models import Account, DouyuTask, User
from web.backend.routers.douyu import supplier_recharge_callback
from web.backend.services.douyu_runner import DouyuBatchRunner
from core.douyu import FishFinRechargeClient, FishFinRechargeConfig
class DouyuGoldRechargeChannelTests(unittest.TestCase):
@@ -39,6 +42,9 @@ class DouyuGoldRechargeChannelTests(unittest.TestCase):
self.session.add(self.task)
self.session.commit()
self.runner = DouyuBatchRunner(self.session, "batch", "create_gold_qr")
os.environ["FISH_FIN_RECHARGE_BASE_URL"] = "https://supplier.example"
os.environ["FISH_FIN_RECHARGE_APP_ID"] = "test-app"
os.environ["FISH_FIN_RECHARGE_APP_SECRET"] = "test-secret"
def tearDown(self):
self.session.close()
@@ -50,7 +56,7 @@ class DouyuGoldRechargeChannelTests(unittest.TestCase):
supplier = Mock()
supplier.create_order.return_value = {
"code": 200,
"result": {"order_status": 2, "order_no": "supplier-001"},
"result": {"order_status": 2, "order_id": "supplier-001"},
"sign": "not-stored",
}
client_class.return_value = supplier
@@ -67,20 +73,23 @@ class DouyuGoldRechargeChannelTests(unittest.TestCase):
)
supplier.create_order.assert_called_once_with(
charge_account="10001",
buy_num=10,
customer_price=unittest.mock.ANY,
customer_order_no=f"DYGF{self.task.id}",
pay_amount=unittest.mock.ANY,
out_order_id=f"DYGF{self.task.id}",
product_id="gold-product",
recharge_arg=[{"templateName": "斗鱼账号", "templateVal": "10001"}],
order_type=0,
notify_url=unittest.mock.ANY,
)
self.assertEqual(str(supplier.create_order.call_args.kwargs["customer_price"]), "10")
self.assertEqual(str(supplier.create_order.call_args.kwargs["pay_amount"]), "10")
self.session.refresh(self.task)
self.assertEqual(self.task.status, "success")
self.assertEqual(self.task.result["recharge_channel"], "supplier_api")
self.assertEqual(self.task.result["supplier_order_status"], 2)
self.assertEqual(self.task.result["buy_num"], 10)
self.assertEqual(self.task.result["customer_price"], "10")
self.assertEqual(self.task.result["out_order_id"], f"DYGF{self.task.id}")
self.assertEqual(self.task.result["order_id"], "supplier-001")
self.assertEqual(self.task.result["pay_amount"], "10")
self.assertNotIn("pay_url", self.task.result)
self.assertNotIn("sign", self.task.result["supplier_order"])
@@ -103,6 +112,43 @@ class DouyuGoldRechargeChannelTests(unittest.TestCase):
self.assertEqual(self.task.status, "failed")
self.assertEqual(self.task.message, "商品已下架")
def test_supplier_callback_verifies_signature_and_updates_terminal_task(self):
self.task.supplier_out_order_id = f"DYGF{self.task.id}"
self.task.result = {"recharge_channel": "supplier_api", "out_order_id": self.task.supplier_out_order_id}
self.session.commit()
client = FishFinRechargeClient(FishFinRechargeConfig(
base_url="https://supplier.example", app_id="test-app", app_secret="test-secret",
))
payload = {
"app_id": "test-app",
"timestamp": 1786629000,
"out_order_id": self.task.supplier_out_order_id,
"order_id": "supplier-001",
"order_type": 0,
"order_status": 2,
"create_time": "2026/8/13 21:30",
}
payload["sign"] = client.sign(payload, "POST")
request = Mock()
request.json = AsyncMock(return_value=payload)
response = asyncio.run(supplier_recharge_callback(request, self.session))
self.assertEqual(response["code"], 200)
self.assertEqual(response["message"], "success")
self.assertTrue(client.verify_response_sign(response, "POST"))
self.session.refresh(self.task)
self.assertEqual(self.task.status, "success")
self.assertEqual(self.task.message, "供应商直充成功(异步通知)")
self.session.refresh(self.account)
self.assertEqual(self.account.bind_status, "gold_recharged")
self.assertEqual(self.task.result["order_id"], "supplier-001")
self.assertEqual(self.task.result["supplier_order_status"], 2)
# 同一终态回调可重复投递,不会改写已结束任务。
asyncio.run(supplier_recharge_callback(request, self.session))
self.session.refresh(self.task)
self.assertEqual(self.task.status, "success")
if __name__ == "__main__":
unittest.main()
+26 -19
View File
@@ -34,16 +34,15 @@ class FishFinRechargeClientTests(unittest.TestCase):
}, "POST")
self.assertEqual(sign, "4087a959f3488ecb13efe6ef58e3bc67")
def test_create_order_posts_json_with_signed_optional_arguments(self):
def test_create_order_posts_new_document_payload(self):
response = Mock()
response.json.return_value = {"code": 200, "order_status": 0}
self.session.post.return_value = response
result = self.client.create_order(
charge_account="10001",
buy_num=2,
customer_price="1.20",
customer_order_no="merchant-001",
pay_amount="1.20",
out_order_id="OUT202503010010208888",
product_id="product-1",
recharge_arg=[{"templateName": "斗鱼账号", "templateVal": "10001"}],
ext_arg={"skuid": 12},
@@ -52,7 +51,14 @@ class FishFinRechargeClientTests(unittest.TestCase):
self.assertEqual(result["code"], 200)
kwargs = self.session.post.call_args.kwargs
self.assertEqual(self.session.post.call_args.args[0], "https://supplier.example/adapter-apiaccess/open/api/createOrderV2")
self.assertEqual(kwargs["json"]["customer_price"], 1.2)
self.assertEqual(kwargs["json"]["pay_amount"], 1.2)
self.assertEqual(kwargs["json"]["out_order_id"], "OUT202503010010208888")
self.assertEqual(kwargs["json"]["order_type"], 0)
self.assertEqual(kwargs["json"]["recharge_arg"], '[{"templateName":"斗鱼账号","templateVal":"10001"}]')
self.assertEqual(kwargs["json"]["ext_arg"], '{"skuid":12}')
self.assertNotIn("charge_account", kwargs["json"])
self.assertNotIn("customer_price", kwargs["json"])
self.assertNotIn("customer_order_no", kwargs["json"])
self.assertEqual(kwargs["json"]["sign"], self.client.sign(kwargs["json"], "POST"))
self.assertEqual(kwargs["timeout"], (8, 20))
@@ -62,29 +68,30 @@ class FishFinRechargeClientTests(unittest.TestCase):
self.session.post.return_value = response
self.client.create_order(
charge_account="10001", buy_num=1, customer_price="1.0",
customer_order_no="merchant-001", product_id="111570",
buy_num=1, pay_amount="1.0",
out_order_id="merchant-001", product_id="111570",
recharge_arg=[{"templateName": "斗鱼UID", "templateVal": "10001"}],
)
body = self.session.post.call_args.kwargs["json"]
self.assertEqual(body["customer_price"], 1)
self.assertEqual(body["pay_amount"], 1)
self.assertNotIn("notify_url", body)
self.assertNotIn("recharge_arg", body)
self.assertEqual(body["recharge_arg"], '[{"templateName":"斗鱼UID","templateVal":"10001"}]')
self.assertNotIn("ext_arg", body)
self.assertEqual(body["sign"], self.client.sign(body, "POST"))
def test_query_order_requires_identifier_and_uses_get_params(self):
with self.assertRaisesRegex(ValueError, "订单标识"):
self.client.query_order()
with self.assertRaisesRegex(ValueError, "out_order_id"):
self.client.query_order("")
response = Mock()
response.json.return_value = {"code": 200, "order_status": 2}
self.session.get.return_value = response
self.client.query_order(customer_order_no="merchant-001")
self.client.query_order("OUT202503010010208888")
kwargs = self.session.get.call_args.kwargs
self.assertEqual(self.session.get.call_args.args[0], "https://supplier.example/adapter-apiaccess/open/api/queryOrderV2")
self.assertEqual(kwargs["params"]["customer_order_no"], "merchant-001")
self.assertEqual(kwargs["params"]["out_order_id"], "OUT202503010010208888")
self.assertEqual(kwargs["params"]["sign"], self.client.sign(kwargs["params"], "GET"))
def test_missing_configuration_is_rejected_before_request(self):
@@ -100,15 +107,15 @@ class FishFinRechargeClientTests(unittest.TestCase):
client = FishFinRechargeClient(self.config, session=self.session, trace=events.append)
client.create_order(
charge_account="10001", buy_num=1, customer_price="0.993",
customer_order_no="merchant-001", product_id="111570",
buy_num=1, pay_amount="1",
out_order_id="merchant-001", product_id="111570",
recharge_arg=[{"templateName": "斗鱼UID", "templateVal": "10001"}],
)
self.assertEqual([event["stage"] for event in events], ["request", "response"])
self.assertNotIn("sign", events[0]["params"])
self.assertNotIn("recharge_arg", events[0]["params"])
self.assertEqual(events[0]["params"]["customer_price"], 0.993)
self.assertEqual(events[0]["params"]["pay_amount"], 1)
def test_debug_trace_includes_complete_request_and_response_bodies(self):
response = Mock()
@@ -125,13 +132,13 @@ class FishFinRechargeClientTests(unittest.TestCase):
client = FishFinRechargeClient(config, session=self.session, trace=events.append)
client.create_order(
charge_account="10001", buy_num=1, customer_price="0.993",
customer_order_no="merchant-001", product_id="111570",
buy_num=1, pay_amount="1",
out_order_id="merchant-001", product_id="111570",
recharge_arg=[{"templateName": "斗鱼UID", "templateVal": "10001"}],
)
self.assertEqual(events[0]["json_body"]["sign"], client.sign(events[0]["json_body"], "POST"))
self.assertEqual(events[0]["json_body"]["customer_price"], 0.993)
self.assertEqual(events[0]["json_body"]["pay_amount"], 1)
self.assertNotIn("sign", events[0]["sign_params"])
self.assertIn(self.config.app_secret, events[0]["sign_source"])
self.assertEqual(events[1]["response_body"]["sign"], "response-sign")