diff --git a/unipay/providers/transfer.py b/unipay/providers/transfer.py index 55aa554..2168918 100644 --- a/unipay/providers/transfer.py +++ b/unipay/providers/transfer.py @@ -9,6 +9,7 @@ from appPublic.timeUtils import curDateString, timestampstr from email.parser import Parser from email.header import decode_header from email.utils import parseaddr +from sqlor.dbpools import DBPools from ..core import Gateway @@ -101,7 +102,7 @@ class TransferGateway(Gateway): dbname = env.get_module_dbname('unipay') async with db.sqlorContext(dbname) as sor: 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()) url = env.entire_url('transfer_info.ui') query_str = urllib.parse.urlencode(ns) diff --git a/unipay/providers/wechat.py b/unipay/providers/wechat.py index a3f6dd0..55f359d 100644 --- a/unipay/providers/wechat.py +++ b/unipay/providers/wechat.py @@ -148,7 +148,7 @@ class WechatGateway(Gateway): body = { "appid": self.appid, "mchid": self.mchid, - "description": payload["subject"], + "description": payload.get("subject") or payload.get("payment_name", "充值"), "out_trade_no": payload["out_trade_no"], "notify_url": payload["notify_url"], "amount": { diff --git a/wwwroot/recharge.ui b/wwwroot/recharge.ui index aa476ea..c51b1ef 100644 --- a/wwwroot/recharge.ui +++ b/wwwroot/recharge.ui @@ -14,6 +14,14 @@ { "value":"alipay", "text":"支付宝" + }, + { + "value":"wechat", + "text":"微信支付" + }, + { + "value":"transfer", + "text":"转账支付" } ] }, diff --git a/wwwroot/user_recharge.dspy b/wwwroot/user_recharge.dspy index daf70bf..7eaf5d1 100644 --- a/wwwroot/user_recharge.dspy +++ b/wwwroot/user_recharge.dspy @@ -5,7 +5,7 @@ if params_kw.amount is None: "message": "需输入充值金额" } } -if params_kw.provider != 'alipay': +if params_kw.provider not in ('alipay', 'wechat', 'transfer'): return { "status": "error", "data": {