revert: 恢复原始支付流程——获取支付URL后直接新窗口跳转,移除QR码
This commit is contained in:
parent
149092a3a0
commit
403cdd5de1
@ -50,7 +50,6 @@ PATHS_LOGINED = [
|
|||||||
f"/unipay/paychannel",
|
f"/unipay/paychannel",
|
||||||
f"/unipay/payfee",
|
f"/unipay/payfee",
|
||||||
f"/unipay/payment_log",
|
f"/unipay/payment_log",
|
||||||
f"/unipay/qr.dspy",
|
|
||||||
f"/unipay/recharge.dspy",
|
f"/unipay/recharge.dspy",
|
||||||
f"/unipay/recharge.ui",
|
f"/unipay/recharge.ui",
|
||||||
f"/unipay/refund.dspy",
|
f"/unipay/refund.dspy",
|
||||||
|
|||||||
@ -1,14 +0,0 @@
|
|||||||
import io, urllib.parse
|
|
||||||
import qrcode
|
|
||||||
from aiohttp import web
|
|
||||||
|
|
||||||
data = params_kw.get('data', '')
|
|
||||||
if not data:
|
|
||||||
return web.Response(status=400, text='missing data')
|
|
||||||
|
|
||||||
data = urllib.parse.unquote(data)
|
|
||||||
img = qrcode.make(data, box_size=10, border=2)
|
|
||||||
buf = io.BytesIO()
|
|
||||||
img.save(buf, format='PNG')
|
|
||||||
buf.seek(0)
|
|
||||||
return web.Response(body=buf.read(), content_type='image/png')
|
|
||||||
@ -1,22 +1,20 @@
|
|||||||
import urllib.parse
|
|
||||||
params_kw.amount = float(params_kw.amount)
|
params_kw.amount = float(params_kw.amount)
|
||||||
debug(f'recharge.dspy: {params_kw=}')
|
debug(f'recharge.dspy: {params_kw=}')
|
||||||
try:
|
try:
|
||||||
code_url = await create_payment(request, params_kw)
|
url = await create_payment(request, params_kw)
|
||||||
if params_kw.provider == 'transfer':
|
if params_kw.provider == 'transfer':
|
||||||
return {
|
return {
|
||||||
"widgettype":"urlwidget",
|
"widgettype":"urlwidget",
|
||||||
"mode":"replace",
|
"mode":"replace",
|
||||||
"target":"app.sage_main_content",
|
"target":"app.sage_main_content",
|
||||||
"options":{"url": code_url}
|
"options":{"url": url}
|
||||||
}
|
}
|
||||||
qr_url = entire_url('/unipay/qr.dspy?data=') + urllib.parse.quote(code_url, safe='')
|
|
||||||
return {
|
return {
|
||||||
"widgettype":"NewWindow",
|
"widgettype":"NewWindow",
|
||||||
"options":{
|
"options":{
|
||||||
"url": qr_url,
|
"url": url,
|
||||||
"height": "340",
|
"height": "100%",
|
||||||
"width":"340"
|
"width":"100%"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
import urllib.parse
|
|
||||||
if params_kw.amount is None:
|
if params_kw.amount is None:
|
||||||
return {
|
return {
|
||||||
"status": "error",
|
"status": "error",
|
||||||
@ -25,12 +24,10 @@ debug(f'user_recharge.dspy: {params_kw=}')
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
url = await create_payment(request, params_kw)
|
url = await create_payment(request, params_kw)
|
||||||
qr_url = entire_url('/unipay/qr.dspy?data=') + urllib.parse.quote(url, safe='')
|
|
||||||
return {
|
return {
|
||||||
"status": "ok",
|
"status": "ok",
|
||||||
"data": {
|
"data": {
|
||||||
"code_url": url,
|
"url": url
|
||||||
"qr_url": qr_url
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user