q-koa 9.6.1 → 9.7.1

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/dashboard_list/config.js

@@ -0,0 +1,25 @@
+module.exports = {
+  name: '首页数据看板',
+  belongs: 'page',
+  multiple: false,
+  availableSort: true,
+  order: [],
+  referenceSelect: [],
+  select: [{"key":"name"}],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [{"sort":"ascending","type":"sortOrder"}],
+  comment: {},
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  initList: [],
+  editInline: {},
+  autoData: {},
+  is_split: false,
+  is_split_count: false,
+  show_virtual: false,
+  modelQuery: {},
+  deleteCheckList: [],
+  bulkCreateList: [],
+};

package/core/file/plugins/dashboard_list/model.js

@@ -0,0 +1,69 @@
+const { Sequelize, Random } = require('q-koa');
+
+
+exports.name = {
+  type: Sequelize.STRING,
+  comment: '名字',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 1,
+  mock: () => Random.ctitle(),
+}
+
+exports.data_list = {
+  type: Sequelize.JSON,
+  comment: '依赖',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: [],
+  sortOrder: 2,
+  get: function () {
+    return this.getDataValue('data_list') || []
+  },
+}
+
+exports.desc = {
+  type: Sequelize.TEXT,
+  comment: '介绍',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 3,
+  mock: () => Random.csentence(),
+  extra: {"type":"markdown"},
+}
+
+exports.role_id = {
+  type: Sequelize.JSON,
+  comment: '角色',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: [],
+  sortOrder: 4,
+  mock: () => Random.range(2).map((item, index) => Random.integer(1, 5)),
+  get: function () {
+    return this.getDataValue('role_id') || []
+  },
+}
+
+exports.sortOrder = {
+  type: Sequelize.MEDIUMINT.UNSIGNED,
+  comment: '排序',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: 0,
+  sortOrder: 5,
+  
+}
+
+exports.is_on = {
+  type: Sequelize.BOOLEAN,
+  comment: '是否',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: true,
+  sortOrder: 6,
+  mock: () => Random.boolean(),
+  extra: {"controlInline":true},
+}

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/service.js

@@ -153,8 +153,19 @@ exports.cash = async ({
 }) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
+
+  const user = await app.model.user.findOne({
+    where: {
+      id: user_id,
+    },
+    include: app.model.mp_user,
+  })
+
+  if (!user) throw new Error('找不到该用户')
+  if (!user.mp_user.openid) throw new Error('找不到该用户openid')
+
   const { mchId, key, appId, partner_key } = await appConfig.getObject(
-    pay_config
+    user.mp_user.appid || pay_config
   )
 
   const { is_dev } = await appConfig.getObject('base')
@@ -170,17 +181,6 @@ exports.cash = async ({
       )
     ), // 微信商户平台证书
   })
-
-  const user = await app.model.user.findOne({
-    where: {
-      id: user_id,
-    },
-    include: app.model.mp_user,
-  })
-
-  if (!user) throw new Error('找不到该用户')
-  if (!user.mp_user.openid) throw new Error('找不到该用户openid')
-
   const amount = Number((Math.abs(number) * 100).toFixed(0))
 
   const result = await payObj.transfers({

package/core/file/utils/index.js

@@ -38,7 +38,8 @@ exports.getObject = (config, app) => async (type) => {
     item.key === type ||
     item.config === type ||
     item.pay_config === type ||
-    (item.ToUserName && item.ToUserName === type)
+    (item.ToUserName && item.ToUserName === type) ||
+    (item.appId && item.appId === type)
   if (app) {
     const applicationList = app.cache.get('application')
     if (applicationList && applicationList.find(findConfig)) {

package/package.json

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