q-koa 10.5.2 → 10.5.4

package/core/app.js

@@ -366,12 +366,12 @@ class APP {
         const db = connectDatabase(dbName)(this.config.db)
         if (!is_dev) {
           if (!dbFlag) {
-            console.log(chalk.green(`检查${dbName}数据库`))
+            console.log(chalk.green(`${appName}检查数据库${dbName}`))
             await db.authenticate()
             dbFlag = true
           }
         } else {
-          console.log(chalk.green(`检查${dbName}数据库`))
+          console.log(chalk.green(`${appName}检查数据库${dbName}`))
           await db.authenticate()
         }
         const configPath = `${rootDirectory}/${APP_DIR}/${appName}/config.js`

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

@@ -1202,6 +1202,8 @@ exports.refund = async (ctx) => {
     config = 'weixin_mp',
     pay_config = 'weixin_pay',
     is_new_pay = false,
+    out_trade_no,
+    type,
   } = ctx.request.body
 
   const fn = is_new_pay ? 'refund_new' : 'refund'
@@ -1214,6 +1216,8 @@ exports.refund = async (ctx) => {
     price,
     config,
     pay_config,
+    out_trade_no,
+    type,
   })
   ctx.SUCCESS('ok')
 }

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

@@ -13,7 +13,7 @@ exports.refund = async ({
   total_fee,
   refund_fee,
   price,
-  type = '',
+  type = 'MP-WEIXIN',
   config = 'weixin_mp',
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
@@ -41,8 +41,8 @@ exports.refund = async ({
   const out_trade_no = _out_trade_no
     ? _out_trade_no
     : prefix
-    ? `${key}_${prefix}-${id}_MP-WEIXIN`
-    : `${key}_${id}_MP-WEIXIN`
+    ? `${key}_${prefix}-${id}_${type}`
+    : `${key}_${id}_${type}`
   const orderDetail = await app.model[orderModel].findOne({
     where: {
       id,

package/package.json

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