q-koa 13.4.5 → 13.4.6

package/core/config.js

@@ -163,7 +163,7 @@ module.exports = {
       )
       router.get('/weixin/messagePush', app.controller.weixin.messagePush)
     }
-
+    router.get('/common/restart', app.controller.common.restart)
     router.get('/common/getAppConfig', app.controller.common.getAppConfig)
     router.get('/common/createQr', app.controller.common.createQr)
     router.get('/lanhu/:str', async (ctx) => {

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

@@ -1201,6 +1201,9 @@ exports.b2b_pay = async (ctx) => {
     pay_key: _pay_key,
   } = await appConfig.getObject('weixin_pay')
 
+  if (!app_key) {
+    throw new Error('缺少app_key')
+  }
   const pay_key = _pay_key || key || appName
 
   const weixinMp = new WeixinMp({
@@ -1214,6 +1217,7 @@ exports.b2b_pay = async (ctx) => {
     ? `${pay_key}_${prefix}-${order_id}_${type}`
     : `${pay_key}_${order_id}_${type}`
 
+  const order_amount = is_admin || is_dev ? 1 : Math.round(price * 100)
   const res = await weixinMp.b2bPay({
     mchid,
     app_key,
@@ -1222,7 +1226,7 @@ exports.b2b_pay = async (ctx) => {
       out_trade_no,
       description: name,
       amount: {
-        order_amount: is_admin || is_dev ? 1 : Math.round(price * 100),
+        order_amount,
       },
     },
   })
@@ -1324,6 +1328,7 @@ exports.notify = async (ctx) => {
       out_trade_no: result.xml.out_trade_no,
       openid,
       pay_type_key,
+      mch_id: result.xml.mch_id,
     })
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.4.5",
+  "version": "13.4.6",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -60,7 +60,8 @@
     "redis": "^4.0.3",
     "yly-nodejs-sdk": "^1.0.2",
     "vm2": "^3.9.19",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "pm2": "^7.0.1"
   },
   "devDependencies": {
     "eslint": "^4.19.1",