q-koa 12.3.3 → 12.3.5

package/core/app.js

@@ -231,7 +231,7 @@ class APP {
         ) {
           return await next()
         }
-        throw new Error('没有权限或登录失效，请重新登录')
+        throw new ServiceError('没有权限或登录失效，请重新登录')
       }
       await next()
     })

package/core/file/services/geo.js

@@ -48,7 +48,7 @@ module.exports = class Singleton {
       .then((res) => res.data)
 
     if (data.status === 0) return data.result
-    throw new Error(data.message)
+    throw new Error(`${this.key.split('-')[0]}${data.message}`)
   }
 
   async getToLngAndLat(name) {
@@ -61,7 +61,7 @@ module.exports = class Singleton {
     if (data.message === '查询无结果') {
       throw new Error(`找不到【${name}】，可能需要更详细一点（省市区）`)
     } else {
-      throw new Error(data.message)
+      throw new Error(`${this.key.split('-')[0]}${data.message}`)
     }
   }
 

package/core/file/services/print.js

@@ -145,6 +145,39 @@ module.exports = class Singleton {
     }
   }
 
+  async getPrintList(machineCode, pageIndex = 1, pageSize = 10) {
+    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.getOrderPagingList(
+        machineCode,
+        pageIndex,
+        pageSize
+      )
+
+      if (res && res.error_description !== 'success') {
+        throw new Error(res.error_description)
+      }
+      return res
+    } 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.3.3",
+  "version": "12.3.5",
   "description": "",
   "main": "index.js",
   "scripts": {