q-koa 8.1.7 → 8.2.0

package/core/app.js

@@ -255,7 +255,11 @@ class APP {
     starter.on('loadAll', async () => {
       const appName = this.config.includes[0]
       this.server = this.app.listen(this.port, () => {
-        console.log(`${moment().format('HH:mm:ss')} server is running at http://localhost:${this.port}`)
+        console.log(
+          `${moment().format(
+            'HH:mm:ss'
+          )} server is running at http://localhost:${this.port}`
+        )
         console.log(
           `first app is http://localhost:3001/${appName}/setting/findOne`
         )

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

@@ -167,3 +167,10 @@ exports.deleteCheckList = {
   allowNull: false,
   defaultValue: [],
 }
+
+exports.bulkCreateList = {
+  type: Sequelize.JSON,
+  comment: '批量更新字段',
+  allowNull: false,
+  defaultValue: [],
+}

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

@@ -86,6 +86,7 @@ exports.loadModel = async ({ app, appName }) => {
         modelQuery: config.modelQuery,
         editInline: config.editInline,
         deleteCheckList: config.deleteCheckList,
+        bulkCreateList: config.bulkCreateList,
         list: attributes.map((attr, index) => {
           const name = attr.match(/exports.(.*)=/)[1].trim()
           let defaultValue = ''

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

@@ -166,8 +166,6 @@ exports.showTables = async (ctx) => {
       autoData: lodash.get(target, 'autoData', null),
       // 有些model需要前置查询其它model数据
       initList: lodash.get(target, 'initList', []),
-      // 批量修改
-      bulkCreateList: lodash.get(target, 'bulkCreateList', []),
       // 局部更新列表
       editInline: lodash.get(target, 'editInline', {}),
       // 有些model需要前置查询其它model数据

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

@@ -943,16 +943,11 @@ exports.url_link = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
   const { page, scene, config = 'weixin_mp' } = ctx.request.body
-  const appConfig = getConfig(app)
-  const { app_id, app_secrect } = await appConfig.getObject(config)
-  const weixinMp = new WeixinMp({
-    appid: app_id,
-    secrect: app_secrect,
-  })
-  weixinMp.init()
-  const result = await weixinMp.createUrlLink({
+  const result = await app.service.weixin.url_link({
+    app,
     page,
     scene,
+    config,
   })
   ctx.SUCCESS(result)
 }
@@ -991,8 +986,8 @@ exports.qr_code = async (ctx) => {
     page,
     is_hyaline,
     scene,
-    is_oss = false,
-    config = 'weixin_mp',
+    is_oss,
+    config,
   })
 
   return ctx.SUCCESS(result)
@@ -1088,8 +1083,11 @@ exports.refund_notify = async (ctx) => {
 
   const refund_price = Number(refund_fee) / 100
 
-  const prefix =
-    out_trade_no.split('_').length === 4 ? out_trade_no.split('_')[1] : ''
+  let prefix = ''
+  if (out_trade_no.split('_')[1].includes('-')) {
+    const arr = out_trade_no.split('_')[1].split('-')
+    ;[prefix] = arr
+  }
 
   const order_id = out_refund_no.includes('_')
     ? Number(out_refund_no.split('_')[0])

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

@@ -34,7 +34,7 @@ exports.refund = async ({
   })
   const orderModel = prefix ? `${prefix}_order` : 'order'
   const out_trade_no = prefix
-    ? `${appName}_${prefix}_${id}_MP-WEIXIN`
+    ? `${appName}_${prefix}-${id}_MP-WEIXIN`
     : `${appName}_${id}_MP-WEIXIN`
   const orderDetail = await app.model[orderModel].findOne({
     where: {
@@ -63,9 +63,14 @@ exports.refund = async ({
   }
 }
 
-exports.cash = async ({ ctx, id, user_id, number }) => {
+exports.cash = async ({
+  ctx,
+  id,
+  user_id,
+  number,
+  pay_config = 'weixin_pay',
+}) => {
   const { app, appName } = getAppByCtx(ctx)
-  const { pay_config = 'weixin_pay' } = ctx.request.body
   const appConfig = getConfig(app)
   const { mchId, key, appId } = await appConfig.getObject(pay_config)
 
@@ -177,3 +182,18 @@ exports.qr_code = async ({
     }
   }
 }
+
+exports.url_link = async ({ app, page, scene, config = 'weixin_mp' }) => {
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+  const result = await weixinMp.createUrlLink({
+    page,
+    scene,
+  })
+  return result
+}

package/package.json

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