q-koa 9.6.0 → 9.7.0

package/core/app.js

@@ -1011,7 +1011,36 @@ class APP {
           let _where
 
           if (where) {
-            _where = _.cloneDeep(where)
+            if (fn === 'findAndCountAll') {
+              const formatWhere = _.mapValues(where, (item) => {
+                if (_.isObject(item)) {
+                  if (
+                    item.hasOwnProperty('$notIn') &&
+                    typeof item.$notIn === 'string'
+                  ) {
+                    return {
+                      $notIn: [Sequelize.literal(item.$notIn)],
+                    }
+                  }
+
+                  if (
+                    item.hasOwnProperty('$in') &&
+                    typeof item.$in === 'string'
+                  ) {
+                    return {
+                      $in: [Sequelize.literal(item.$in)],
+                    }
+                  }
+                  return item
+                } else {
+                  return item
+                }
+              })
+              _where = _.cloneDeep(formatWhere)
+            } else {
+              _where = _.cloneDeep(where)
+            }
+
             // if (util.isObject(where)) {
             //   _where = _.cloneDeep(where);
             // } else if (util.isString(where)) {

package/core/config.js

@@ -99,6 +99,7 @@ module.exports = {
       $lte: Sequelize.Op.lte,
       $between: Sequelize.Op.between,
       $notIn: Sequelize.Op.notIn,
+      $in: Sequelize.Op.in,
     },
   },
   app: {

package/core/file/plugins/routes/config.js

@@ -8,6 +8,7 @@ module.exports = {
     { key: 'parent_id' },
     {
       key: 'key',
+      symbol: '$like',
     },
     {
       key: 'url',

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

@@ -1158,12 +1158,12 @@ exports.refund_notify = async (ctx) => {
   const pay_config = ctx.params.sub || 'weixin_pay'
 
   const appConfig = getConfig(app)
-  const { key } = await appConfig.getObject(pay_config)
+  const { key, partner_key } = await appConfig.getObject(pay_config)
 
   const { req_info } = result.xml
   const refundResult = await getRefundResultJson({
     req_info,
-    app_key: key,
+    app_key: key.length > 10 ? key : partner_key,
   })
 
   const { out_refund_no, out_trade_no, total_fee, refund_fee } = refundResult
@@ -1271,6 +1271,7 @@ exports.checkPay = async (ctx) => {
       order_id: id,
       order_price,
       transactionid: payResult.transaction_id,
+      out_trade_no: payResult.out_trade_no,
     })
   }
 

package/package.json

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