feat: 启用微信支付和转账支付渠道
- recharge.ui: 下拉列表添加微信支付和转账支付选项 - user_recharge.dspy: 扩展provider校验,支持wechat/transfer - wechat.py: 修复description字段兼容payment_name - transfer.py: 导入DBPools + 修复tcode拼写错误
This commit is contained in:
parent
7a0e87e735
commit
ccee3ba12b
@ -9,6 +9,7 @@ from appPublic.timeUtils import curDateString, timestampstr
|
|||||||
from email.parser import Parser
|
from email.parser import Parser
|
||||||
from email.header import decode_header
|
from email.header import decode_header
|
||||||
from email.utils import parseaddr
|
from email.utils import parseaddr
|
||||||
|
from sqlor.dbpools import DBPools
|
||||||
from ..core import Gateway
|
from ..core import Gateway
|
||||||
|
|
||||||
|
|
||||||
@ -101,7 +102,7 @@ class TransferGateway(Gateway):
|
|||||||
dbname = env.get_module_dbname('unipay')
|
dbname = env.get_module_dbname('unipay')
|
||||||
async with db.sqlorContext(dbname) as sor:
|
async with db.sqlorContext(dbname) as sor:
|
||||||
sql = "select * from transfercode where tcode=${tcode}$ and status='0'"
|
sql = "select * from transfercode where tcode=${tcode}$ and status='0'"
|
||||||
ns.tcoce = await self.new_tcode(sor)
|
ns.tcode = await self.new_tcode(sor)
|
||||||
await sor.C('transfercode', ns.copy())
|
await sor.C('transfercode', ns.copy())
|
||||||
url = env.entire_url('transfer_info.ui')
|
url = env.entire_url('transfer_info.ui')
|
||||||
query_str = urllib.parse.urlencode(ns)
|
query_str = urllib.parse.urlencode(ns)
|
||||||
|
|||||||
@ -148,7 +148,7 @@ class WechatGateway(Gateway):
|
|||||||
body = {
|
body = {
|
||||||
"appid": self.appid,
|
"appid": self.appid,
|
||||||
"mchid": self.mchid,
|
"mchid": self.mchid,
|
||||||
"description": payload["subject"],
|
"description": payload.get("subject") or payload.get("payment_name", "充值"),
|
||||||
"out_trade_no": payload["out_trade_no"],
|
"out_trade_no": payload["out_trade_no"],
|
||||||
"notify_url": payload["notify_url"],
|
"notify_url": payload["notify_url"],
|
||||||
"amount": {
|
"amount": {
|
||||||
|
|||||||
@ -14,6 +14,14 @@
|
|||||||
{
|
{
|
||||||
"value":"alipay",
|
"value":"alipay",
|
||||||
"text":"支付宝"
|
"text":"支付宝"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value":"wechat",
|
||||||
|
"text":"微信支付"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"value":"transfer",
|
||||||
|
"text":"转账支付"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
|||||||
@ -5,7 +5,7 @@ if params_kw.amount is None:
|
|||||||
"message": "需输入充值金额"
|
"message": "需输入充值金额"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if params_kw.provider != 'alipay':
|
if params_kw.provider not in ('alipay', 'wechat', 'transfer'):
|
||||||
return {
|
return {
|
||||||
"status": "error",
|
"status": "error",
|
||||||
"data": {
|
"data": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user