q-koa 13.3.2 → 13.3.4

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

@@ -224,6 +224,10 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
                   [item]: list,
                 }
               })
+            } else {
+              return Promise.resolve({
+                [item]: [],
+              })
             }
           } else {
             return Promise.resolve({

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

@@ -1012,7 +1012,6 @@ exports.mp_pay = async (ctx) => {
     pay_config = 'weixin_pay',
     profit_sharing = 'N',
   } = ctx.request.body
-
   if (price === 0) throw new Error('价格不能为0')
 
   if (type === 'H5-WEIXIN') {
@@ -1030,8 +1029,14 @@ exports.mp_pay = async (ctx) => {
   }
   const appConfig = getConfig(app)
 
-  const { mchId, key, partner_key } = await appConfig.getObject(pay_config)
+  const {
+    mchId,
+    key,
+    pay_key: _pay_key,
+    partner_key,
+  } = await appConfig.getObject(pay_config)
 
+  const pay_key = _pay_key || key || appName
   const { is_dev, site_host } = await appConfig.getObject('base')
   // 公众号支付用 服务号 appid，其他用小程序 appid
   const app_id =
@@ -1042,7 +1047,7 @@ exports.mp_pay = async (ctx) => {
   const wxpay = WXPay({
     appid: app_id,
     mch_id: mchId,
-    partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
+    partner_key, // 微信商户平台API密钥
   })
 
   const userDetail =
@@ -1053,13 +1058,12 @@ exports.mp_pay = async (ctx) => {
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${key.length > 10 ? appName : key}_${prefix}-${order_id}_${type}`
-    : `${key.length > 10 ? appName : key}_${order_id}_${type}`
+    ? `${pay_key}_${prefix}-${order_id}_${type}`
+    : `${pay_key}_${order_id}_${type}`
 
   const notify_url = `https://${
     site_host || 'api.kuashou.com'
   }/${appName}/weixin/notify`
-
   const prePayResult = await wxpay.getBrandWCPayRequestParamsSync({
     openid: userDetail.openid,
     body: name,

package/package.json

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