q-koa 12.2.2 → 12.2.4

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

@@ -71,6 +71,9 @@ exports.loadModel = async ({ app, appName }) => {
             app,
             model: result[i],
           })
+          if (countNumber >= 100000) {
+            console.warn('数据量大，请注意', result[i], countNumber)
+          }
           if (tableIndexList.length <= 1) {
             console.warn(`${result[i]} count ${countNumber}没有索引`)
           }

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

@@ -1417,7 +1417,7 @@ exports.article = async (ctx) => {
   return ctx.SUCCESS(result)
 }
 
-exports.checkPay = async (ctx) => {
+exports.checkPay = async (ctx, _data) => {
   const { app, appName, controller } = getAppByCtx(ctx)
 
   const {
@@ -1427,15 +1427,19 @@ exports.checkPay = async (ctx) => {
     pay_config = 'weixin_pay',
     type = 'MP-WEIXIN',
     out_trade_no: _out_trade_no,
-  } = ctx.request.body
+  } = _data || ctx.request.body
 
   const orderModel = prefix ? `${prefix}_order` : 'order'
+
   const result = await app.model[orderModel].findOne({
     where: {
       id,
     },
   })
-  if (!result) return ctx.SUCCESS('找不到')
+  if (!result) {
+    ctx.SUCCESS('找不到')
+    throw new Error(`找不到`)
+  }
 
   const appConfig = getConfig(app)
   const app_id = (await appConfig.getObject(config)).app_id
@@ -1467,6 +1471,7 @@ exports.checkPay = async (ctx) => {
   }
 
   ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
+  return { prefix, out_trade_no, ...payResult }
 }
 
 exports.checkPayOnly = async (ctx) => {

package/core/file/services/print.js

@@ -89,6 +89,62 @@ module.exports = class Singleton {
     }
   }
 
+  async addPrinter(machineCode, msign, nickName = '', phone = '') {
+    const app = this.config.app
+    const accessToken = await this.getAccessToken()
+    try {
+      const RpcClient = new yly.RpcClient(accessToken, this.oauthConfig)
+      const Print = new yly.Printer(RpcClient)
+      const res = await Print.addPrinter(machineCode, msign, nickName, phone)
+
+      if (res && res.error_description !== 'success') {
+        throw new Error(res.error_description)
+      }
+    } catch (e) {
+      await app.model.setting.update(
+        {
+          value: '',
+        },
+        {
+          where: {
+            code: 'print_token',
+            name: 'AccessToken',
+          },
+        }
+      )
+      throw new Error(`请重试,${e.message}`)
+      // return await this.print({ order_id, content })
+    }
+  }
+
+  async deletePrinter(machineCode) {
+    const app = this.config.app
+    const accessToken = await this.getAccessToken()
+    try {
+      const RpcClient = new yly.RpcClient(accessToken, this.oauthConfig)
+      const Print = new yly.Printer(RpcClient)
+      const res = await Print.deletePrinter(machineCode)
+
+      if (res && res.error_description !== 'success') {
+        throw new Error(res.error_description)
+      }
+    } catch (e) {
+      await app.model.setting.update(
+        {
+          value: '',
+        },
+        {
+          where: {
+            code: 'print_token',
+            name: 'AccessToken',
+          },
+        }
+      )
+      throw new Error(`请重试,${e.message}`)
+      // return await this.print({ order_id, content })
+    }
+  }
+
   async cancelAll() {
     const app = this.config.app
     const accessToken = await this.getAccessToken()

package/package.json

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