q-koa 10.1.2 → 10.1.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -815,7 +815,7 @@ exports.h5_pay = async (ctx) => {
|
|
|
815
815
|
}/${appName}/weixin/notify`
|
|
816
816
|
const result = await payObj.run({
|
|
817
817
|
body: name,
|
|
818
|
-
out_trade_no: `${key}_${order_id}_${type}`,
|
|
818
|
+
out_trade_no: `${key.length > 10 ? appName : key}_${order_id}_${type}`,
|
|
819
819
|
total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
|
|
820
820
|
notify_url,
|
|
821
821
|
scene_info: `{"h5_info": {"type":"Wap","wap_url": ${
|
|
@@ -894,8 +894,8 @@ exports.mp_pay = async (ctx) => {
|
|
|
894
894
|
const out_trade_no = _out_trade_no
|
|
895
895
|
? _out_trade_no
|
|
896
896
|
: prefix
|
|
897
|
-
? `${key}_${prefix}-${order_id}_${type}`
|
|
898
|
-
: `${key}_${order_id}_${type}`
|
|
897
|
+
? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
|
|
898
|
+
: `${key.length > 10 ? appName : key}_${order_id}_${type}`
|
|
899
899
|
|
|
900
900
|
const notify_url = `https://${
|
|
901
901
|
site_host || 'api.kuashou.com'
|
|
@@ -928,6 +928,11 @@ exports.mp_pay = async (ctx) => {
|
|
|
928
928
|
timeStamp,
|
|
929
929
|
} = prePayResult
|
|
930
930
|
|
|
931
|
+
if (!nonce_str) {
|
|
932
|
+
console.error(`可能微信商户被暂停使用`)
|
|
933
|
+
throw new Error(`签名错误，请通知平台检查后再试`)
|
|
934
|
+
}
|
|
935
|
+
|
|
931
936
|
if (prepay_id.includes('undefined')) {
|
|
932
937
|
const model = type === 'H5-WEIXIN' ? 'h5_user' : 'mp_user'
|
|
933
938
|
const userTarget = await app.model[model].findOne({
|
|
@@ -1009,8 +1014,8 @@ exports.mp_pay_new = async (ctx) => {
|
|
|
1009
1014
|
const out_trade_no = _out_trade_no
|
|
1010
1015
|
? _out_trade_no
|
|
1011
1016
|
: prefix
|
|
1012
|
-
? `${key}_${prefix}-${order_id}`
|
|
1013
|
-
: `${key}_${order_id}`
|
|
1017
|
+
? `${key.length > 10 ? appName : key}_${prefix}-${order_id}`
|
|
1018
|
+
: `${key.length > 10 ? appName : key}_${order_id}`
|
|
1014
1019
|
|
|
1015
1020
|
const prePayResult = await weixinMp.createOrder({
|
|
1016
1021
|
openid: userDetail.openid,
|
|
@@ -1362,7 +1367,7 @@ exports.checkPayNew = async (ctx) => {
|
|
|
1362
1367
|
const orderPrefix = prefix ? `${prefix}-` : ''
|
|
1363
1368
|
const out_trade_no = _out_trade_no
|
|
1364
1369
|
? _out_trade_no
|
|
1365
|
-
: `${key}_${orderPrefix}${id}`
|
|
1370
|
+
: `${key.length > 10 ? appName : key}_${orderPrefix}${id}`
|
|
1366
1371
|
|
|
1367
1372
|
const payResult = await weixinMp.getOrder({
|
|
1368
1373
|
trade_no: out_trade_no,
|