q-koa 7.7.7 → 7.8.2

package/core/app.js

@@ -243,7 +243,7 @@ class APP {
     //   console.log(content);
     // });
 
-    starter.on('loadAll', () => {
+    starter.on('loadAll', async () => {
       const appName = this.config.includes[0]
       this.server = this.app.listen(this.port, () => {
         console.log(`server is running at http://localhost:${this.port}`)
@@ -360,7 +360,7 @@ class APP {
           this.initFile(appName)
         }
 
-        this.initPlugin(appName)
+        await this.initPlugin(appName)
         this.app[appName].event = new EventEmitter()
 
         const cacheConfig = _.get(this.app[appName], 'appConfig.cache', {
@@ -373,7 +373,7 @@ class APP {
           maxAge: cacheConfig.maxAge,
         })
 
-        this.initModel(appName)
+        await this.initModel(appName)
         // const models = Object.keys(this.app[appName].model).join(' / ')
         if (taskConfig.is_available) {
           this.initTask(appName)
@@ -422,7 +422,7 @@ class APP {
     }
   }
 
-  initTask(appName) {
+  async initTask(appName) {
     console.log(chalk.red(`启动任务${appName}`))
     const taskDir = path.resolve(
       __dirname,
@@ -431,7 +431,8 @@ class APP {
     const publicExist = fs.existsSync(taskDir)
     if (!publicExist) await fsPromise.mkdir(taskDir)
     const list = await fsPromise.readdir(taskDir)
-    list.forEach((folder) => {
+    for (let i = 0; i < list.length; i++) {
+      const folder = list[i]
       const isFolder = fs.lstatSync(path.resolve(taskDir, folder)).isDirectory()
       if (isFolder) {
         const folderDir = await fsPromise.readdir(path.resolve(taskDir, folder))
@@ -450,10 +451,10 @@ class APP {
           }
         })
       }
-    })
+    }
   }
 
-  initPlugin(appName) {
+  async initPlugin(appName) {
     const pluginDir = path.resolve(
       __dirname,
       `${rootDirectory}/${APP_DIR}/${appName}/${PLUGINS_DIR}`
@@ -461,12 +462,15 @@ class APP {
     const publicExist = fs.existsSync(pluginDir)
     if (!publicExist) await fsPromise.mkdir(pluginDir)
     const pluginDirResult = await fsPromise.readdir(pluginDir)
-    pluginDirResult.forEach((folder) => {
+    for (let i = 0; i < pluginDirResult.length; i++) {
+      const folder = pluginDirResult[i]
       const isFolder = fs
         .lstatSync(path.resolve(pluginDir, folder))
         .isDirectory()
       if (isFolder) {
-        const folderResult = await fsPromise.readdir(path.resolve(pluginDir, folder))
+        const folderResult = await fsPromise.readdir(
+          path.resolve(pluginDir, folder)
+        )
         folderResult.forEach((filename) => {
           const extname = path.extname(filename)
           if (extname === '.js') {
@@ -662,7 +666,7 @@ class APP {
           }
         })
       }
-    })
+    }
   }
 
   initModel(appName) {

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

@@ -956,15 +956,21 @@ exports.refund_notify = async (ctx) => {
   const prefix =
     out_trade_no.split('_').length === 4 ? out_trade_no.split('_')[1] : ''
 
-  const order_id = Number(out_refund_no)
+  const order_id = out_refund_no.includes('_')
+    ? Number(out_refund_no.split('_')[0])
+    : Number(out_refund_no)
+  const type = out_refund_no.includes('_') ? out_refund_no.split('_')[1] : ''
   const model = prefix ? `${prefix}_order` : 'order'
-  console.log(out_refund_no, '微信支付回调-----', model)
+  console.log(
+    `微信退款回调 prefix:${prefix}/model:${model}/order_id:${order_id}/type:${type}`
+  )
   if (app.service[model] && app.service[model].refund_notify) {
     await app.service[model].refund_notify({
       app,
       order_id,
       order: model,
       refund_price,
+      type,
     })
   }
 

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

@@ -11,6 +11,7 @@ exports.refund = async ({
   total_fee,
   refund_fee,
   price,
+  type = '',
   ...rest
 }) => {
   const { app, appName } = getAppByCtx(ctx)
@@ -43,7 +44,7 @@ exports.refund = async ({
     const { result_code, err_code_des } = await payObj.refund({
       ...rest,
       out_trade_no,
-      out_refund_no: id + '',
+      out_refund_no: id + '_' + type,
       total_fee: Math.round((total_fee || refund_fee || price) * 100),
       refund_fee: Math.round((refund_fee || price) * 100),
       notify_url: `https://${

package/package.json

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