q-koa 7.8.0 → 7.8.3

package/core/app.js

@@ -1472,11 +1472,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]({

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

@@ -956,12 +956,14 @@ exports.refund_notify = async (ctx) => {
   const prefix =
     out_trade_no.split('_').length === 4 ? out_trade_no.split('_')[1] : ''
 
-  const order_id = out_trade_no.includes('_')
-    ? Number(out_trade_no.split('_')[0])
-    : Number(out_trade_no)
-  const type = out_trade_no.includes('_') ? out_trade_no.split('_')[1] : ''
+  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, '微信支付回调-----', 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.0",
+  "version": "7.8.3",
   "description": "",
   "main": "index.js",
   "scripts": {