q-koa 10.1.3 → 10.1.5

package/core/file/plugins/weixin/controller.js

@@ -815,7 +815,7 @@ exports.h5_pay = async (ctx) => {
   }/${appName}/weixin/notify`
   const result = await payObj.run({
     body: name,
-    out_trade_no: `${key}_${order_id}_${type}`,
+    out_trade_no: `${key.length > 10 ? appName : key}_${order_id}_${type}`,
     total_fee: is_admin || is_dev ? 1 : Math.round(price * 100),
     notify_url,
     scene_info: `{"h5_info": {"type":"Wap","wap_url": ${
@@ -1014,8 +1014,8 @@ exports.mp_pay_new = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${key}_${prefix}-${order_id}`
-    : `${key}_${order_id}`
+    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}`
+    : `${key.length > 10 ? appName : key}_${order_id}`
 
   const prePayResult = await weixinMp.createOrder({
     openid: userDetail.openid,
@@ -1367,7 +1367,7 @@ exports.checkPayNew = async (ctx) => {
   const orderPrefix = prefix ? `${prefix}-` : ''
   const out_trade_no = _out_trade_no
     ? _out_trade_no
-    : `${key}_${orderPrefix}${id}`
+    : `${key.length > 10 ? appName : key}_${orderPrefix}${id}`
 
   const payResult = await weixinMp.getOrder({
     trade_no: out_trade_no,

package/core/file/plugins/weixin/service.js

@@ -1,4 +1,4 @@
-const { getAppByCtx, getConfig, lodash } = require('q-koa')
+const { getAppByCtx, getAppConfig, getConfig, lodash } = require('q-koa')
 const { Pay } = require('@sigodenjs/wechatpay')
 const path = require('path')
 const fsPromise = require('fs/promises')
@@ -174,9 +174,10 @@ exports.cash = async ({
   if (!user) throw new Error('找不到该用户')
   if (!user.mp_user.openid) throw new Error('找不到该用户openid')
 
-  const { mchId, key, appId, partner_key } = await appConfig.getObject(
-    user.mp_user.appid || pay_config
-  )
+  const { mchId, key, appId, partner_key } = await getAppConfig({
+    app,
+    app_id: user.mp_user.appid,
+  })
 
   const { is_dev } = await appConfig.getObject('base')
 

package/core/file/utils/index.js

@@ -160,12 +160,12 @@ exports.getImageType = (fileBuffer) => {
   return ''
 }
 
-exports.getAppConfig = async ({ app, config, key }) => {
-  if (!(app && (config || key))) return null
+exports.getAppConfig = async ({ app, config, key, app_id }) => {
+  if (!(app && (config || key || app_id))) return null
   const application =
     app.cache.get('application') || (await app.model.application.findAll())
 
-  const target = application.find(findConfig(config || key))
+  const target = application.find(findConfig(config || key || app_id))
 
   return target || null
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "10.1.3",
+  "version": "10.1.5",
   "description": "",
   "main": "index.js",
   "scripts": {