fix(wechat): revert to H5 payment — h5_url is directly browser-openable, no tenpay conversion needed
This commit is contained in:
parent
d4c9568673
commit
2cac8fe4be
@ -155,7 +155,7 @@ class WechatGateway(Gateway):
|
|||||||
# -----------------------------------------------------
|
# -----------------------------------------------------
|
||||||
async def create_payment(self, payload: Dict[str, Any]) -> str:
|
async def create_payment(self, payload: Dict[str, Any]) -> str:
|
||||||
"""
|
"""
|
||||||
Native 下单(扫码支付)
|
H5 下单(返回浏览器可打开的支付页面 URL)
|
||||||
"""
|
"""
|
||||||
body = {
|
body = {
|
||||||
"appid": self.appid,
|
"appid": self.appid,
|
||||||
@ -166,11 +166,15 @@ class WechatGateway(Gateway):
|
|||||||
"amount": {
|
"amount": {
|
||||||
"total": int(payload["amount"] * 100),
|
"total": int(payload["amount"] * 100),
|
||||||
"currency": payload.get("currency", "CNY")
|
"currency": payload.get("currency", "CNY")
|
||||||
|
},
|
||||||
|
"scene_info": {
|
||||||
|
"payer_client_ip": payload.get("client_ip", "127.0.0.1"),
|
||||||
|
"h5_info": {"type": "Wap"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
body_str = json.dumps(body, ensure_ascii=False)
|
body_str = json.dumps(body, ensure_ascii=False)
|
||||||
|
|
||||||
url_path = "/v3/pay/transactions/native"
|
url_path = "/v3/pay/transactions/h5"
|
||||||
url = WECHAT_API_BASE + url_path
|
url = WECHAT_API_BASE + url_path
|
||||||
auth = self._sign("POST", url_path, body_str)
|
auth = self._sign("POST", url_path, body_str)
|
||||||
|
|
||||||
@ -184,10 +188,10 @@ class WechatGateway(Gateway):
|
|||||||
err_code = ret.get("code", "UNKNOWN")
|
err_code = ret.get("code", "UNKNOWN")
|
||||||
err_msg = ret.get("message", str(ret))
|
err_msg = ret.get("message", str(ret))
|
||||||
raise Exception(f"WeChat API error (HTTP {resp.status}): [{err_code}] {err_msg}")
|
raise Exception(f"WeChat API error (HTTP {resp.status}): [{err_code}] {err_msg}")
|
||||||
code_url = ret.get("code_url")
|
h5_url = ret.get("h5_url")
|
||||||
if not code_url:
|
if not h5_url:
|
||||||
raise Exception(f"WeChat Native API response missing code_url: {json.dumps(ret, ensure_ascii=False)}")
|
raise Exception(f"WeChat API response missing h5_url: {json.dumps(ret, ensure_ascii=False)}")
|
||||||
return code_url
|
return h5_url
|
||||||
|
|
||||||
# -----------------------------------------------------
|
# -----------------------------------------------------
|
||||||
async def refund(self, payload: Dict[str, Any]) -> Dict[str, Any]:
|
async def refund(self, payload: Dict[str, Any]) -> Dict[str, Any]:
|
||||||
|
|||||||
@ -1,20 +1,18 @@
|
|||||||
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}
|
||||||
}
|
}
|
||||||
# weixin://wxpay/bizpayurl?pr=xxx → https://wx.tenpay.com/f2f?pr=xxx
|
|
||||||
pay_url = code_url.replace('weixin://wxpay/bizpayurl', 'https://wx.tenpay.com/f2f')
|
|
||||||
return {
|
return {
|
||||||
"widgettype":"NewWindow",
|
"widgettype":"NewWindow",
|
||||||
"options":{
|
"options":{
|
||||||
"url": pay_url,
|
"url": url,
|
||||||
"height": "100%",
|
"height": "100%",
|
||||||
"width":"100%"
|
"width":"100%"
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user