q-koa 13.4.5 → 13.5.0

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/common/controller.js

@@ -16,6 +16,7 @@ const OSS = require('ali-oss')
 const axios = require('axios')
 const util = require('util')
 const jwt = require('jsonwebtoken')
+const pm2 = require('pm2')
 
 const { getImageType } = require('../../utils')
 const Email = require('../../services/email')
@@ -746,3 +747,27 @@ exports.copyDB = async (ctx) => {
 
   ctx.SUCCESS('ok')
 }
+
+exports.restart = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { hour: _hour } = ctx.request.query
+
+  const hour = moment().hour()
+  if (hour === Number(_hour)) {
+    pm2.connect((err) => {
+      console.log(err)
+      app.service.log.push({
+        app,
+        message: '重启了',
+      })
+      setTimeout(() => {
+        pm2.reload(appName)
+      }, 1000)
+    })
+
+    ctx.SUCCESS('ok')
+  } else {
+    return ctx.SUCCESS('?hour=')
+  }
+}

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,
     })
   }
 
@@ -1607,6 +1612,7 @@ exports.checkPay = async (ctx, _data) => {
     pay_config = 'weixin_pay',
     type = 'MP-WEIXIN',
     out_trade_no: _out_trade_no,
+    mch_id = '',
   } = _data || ctx.request.body
 
   const orderModel = prefix ? `${prefix}_order` : 'order'
@@ -1627,7 +1633,7 @@ exports.checkPay = async (ctx, _data) => {
 
   const wxpay = WXPay({
     appid: app_id,
-    mch_id: mchId,
+    mch_id: mch_id || mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 
@@ -1664,6 +1670,7 @@ exports.checkPayOnly = async (ctx, _data) => {
     pay_config = 'weixin_pay',
     type = 'MP-WEIXIN',
     out_trade_no: _out_trade_no,
+    mch_id = '',
   } = _data || ctx.request.body
 
   const appConfig = getConfig(app)
@@ -1672,7 +1679,7 @@ exports.checkPayOnly = async (ctx, _data) => {
 
   const wxpay = WXPay({
     appid: app_id,
-    mch_id: mchId,
+    mch_id: mch_id || mchId,
     partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
   })
 

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

@@ -615,6 +615,7 @@ exports.funds_order_pay = async ({ ctx, app, result }) => {
           order: model,
           order_price: amount / 100,
           transactionid,
+          mch_id: result.order_info.mchid,
         })
       }
     }
@@ -678,6 +679,85 @@ exports.funds_order_refund = async ({ ctx, app, result }) => {
   }
 }
 
+exports.retail_refund_notify = async ({ ctx, app, result }) => {
+  if (result) {
+    let prefix = ''
+    let order_id = result.out_trade_no.split('_')[1]
+    if (order_id.includes('-')) {
+      const arr = order_id.split('-')
+      order_id = Number(arr[1])
+      ;[prefix] = arr
+    } else {
+      order_id = Number(order_id)
+    }
+    const model = prefix ? `${prefix}_order` : 'order'
+
+    const trade_no = result.out_trade_no.split('_').slice(0, 2).join('_')
+
+    const type = trade_no.includes('_') ? trade_no.split('_')[1] : ''
+
+    if (app.service[model] && app.service[model].refund_notify) {
+      if (result.refund_status === 'REFUND_SUCC') {
+        await app.service[model].refund_notify({
+          ctx,
+          app,
+          order_id,
+          order: model,
+          refund_price: result.refund_amount / 100,
+          type,
+          mch_id: result.mchid,
+        })
+      } else {
+        app.service.log.push({
+          app,
+          message: JSON.stringify(result),
+          url: 'retail_refund_notify',
+        })
+      }
+    }
+  }
+}
+
+exports.retail_pay_notify = async ({ ctx, app, result }) => {
+  if (result) {
+    let prefix = ''
+    let order_id = result.out_trade_no.split('_')[1]
+    if (order_id.includes('-')) {
+      const arr = order_id.split('-')
+      order_id = Number(arr[1])
+      ;[prefix] = arr
+    } else {
+      order_id = Number(order_id)
+    }
+    const model = prefix ? `${prefix}_order` : 'order'
+    let transactionid = ''
+    try {
+      transactionid = result.wxpay_transaction_id
+    } catch (e) {}
+
+    console.log(result.mchid)
+    if (app.service[model] && app.service[model].notify) {
+      if (result.pay_status === 'ORDER_PAY_SUCC') {
+        await app.service[model].notify({
+          ctx,
+          app,
+          order_id,
+          order: model,
+          order_price: result.amount.order_amount / 100,
+          transactionid,
+          mch_id: result.mchid,
+        })
+      } else {
+        app.service.log.push({
+          app,
+          message: JSON.stringify(result),
+          url: 'retail_pay_notify',
+        })
+      }
+    }
+  }
+}
+
 exports.pc_pay = async ({
   ctx,
   name,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.4.5",
+  "version": "13.5.0",
   "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",