q-koa 7.8.1 → 7.8.4

package/core/app.js

@@ -729,17 +729,31 @@ class APP {
         }
 
         if (model1 && this.app[appName].model[model1]) {
-          this.app[appName].model[model].hasOne(
-            this.app[appName].model[model1],
-            {
-              foreignKey: 'id',
-              sourceKey: `${model1}_id`,
-              constraints: false,
-            }
-          )
-          this.app[appName].include[model].push({
-            model: this.app[appName].model[model1],
-          })
+          const is_multiple =
+            (this.app[appName].attributes[model][model1 + '_id'].defaultValue &&
+              Array.isArray(
+                this.app[appName].attributes[model][model1 + '_id'].defaultValue
+              )) ||
+            (this.app[appName].attributes[model][model1 + '_id'].type &&
+              this.app[appName].attributes[model][model1 + '_id'].type ===
+                'JSON') ||
+            (this.app[appName].attributes[model][model1 + '_id'].type &&
+              this.app[appName].attributes[model][model1 + '_id'].type.key &&
+              this.app[appName].attributes[model][model1 + '_id'].type.key ===
+                'JSON')
+          if (!is_multiple) {
+            this.app[appName].model[model].hasOne(
+              this.app[appName].model[model1],
+              {
+                foreignKey: 'id',
+                sourceKey: `${model1}_id`,
+                constraints: false,
+              }
+            )
+            this.app[appName].include[model].push({
+              model: this.app[appName].model[model1],
+            })
+          }
           if (
             this.app[appName].attributes[model][`${model1}_id`].hasOne &&
             this.app[appName].attributes[model][`${model1}_id`].hasOne === true
@@ -1472,11 +1486,15 @@ class APP {
                 if (omit.length === 0) {
                   ctx.SUCCESS(result)
                 } else {
-                  ctx.SUCCESS(
-                    result.map((target) => {
-                      return _.omit(target.toJSON(), omit)
-                    })
-                  )
+                  if (['findAndCountAll', 'findAll'].includes(fn)) {
+                    ctx.SUCCESS(
+                      result.map((target) => {
+                        return _.omit(target.toJSON(), omit)
+                      })
+                    )
+                  } else {
+                    ctx.SUCCESS(_.omit(result.toJSON(), omit))
+                  }
                 }
               } else {
                 const rows = await app[appName].model[controller][fn]({
@@ -1496,7 +1514,7 @@ class APP {
                   if (rows.length === 0) ctx.SUCCESS([])
                   let objList = {}
                   for (let j = 0; j < specialInclude.length; j++) {
-                    const model = specialInclude[j].model
+                    const { model, ...rest } = specialInclude[j]
                     const modelName = model.getName()
                     const modelIdList = _.uniq(
                       rows
@@ -1513,6 +1531,7 @@ class APP {
                         where: {
                           id: modelIdList,
                         },
+                        ...rest,
                       })
                       objList = {
                         ...objList,

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

@@ -961,7 +961,9 @@ exports.refund_notify = async (ctx) => {
     : 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, '微信支付回调-----', type, 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,

package/package.json

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