q-koa 13.8.8 → 13.8.9

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

@@ -450,6 +450,7 @@ const expressFn = async ({ app, express_number: _express_number, mobile }) => {
   const { app_code, express_mobile: default_express_mobile } =
     await appConfig.getObject('express')
 
+  if (!_express_number) throw new Error('快递单号不能为空')
   const express_number = _express_number.replace(/\t/, '').trim()
 
   const express_mobile = mobile || default_express_mobile
@@ -466,7 +467,7 @@ const expressFn = async ({ app, express_number: _express_number, mobile }) => {
         express_number,
       },
     })
-    if (history) {
+    if (history && history.result && history.result.updateTime) {
       const diffNoLong = moment().diff(moment(history.updated_at), 'hours') < 1
       const isTooLong =
         moment().diff(moment(history.result.updateTime), 'days') > 30
@@ -518,6 +519,7 @@ exports.express = async (ctx) => {
         return expressFn({
           app,
           express_number: item,
+          mobile,
         })
       })
     )

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

@@ -41,15 +41,15 @@ exports.loadModel = async ({ app, appName }) => {
         ? require(configPath)
         : require(defaultConfigPath)
 
-      const modelFile =
-        defaultModelExist || modelExist
-          ? (await fsPromise.readFile(filePath, 'utf-8'))
-            ? await fsPromise.readFile(filePath, 'utf-8')
-            : await fsPromise.readFile(defaultFilePath, 'utf-8')
-          : null
+      let modelFile = null
+      if (modelExist) {
+        modelFile = await fsPromise.readFile(filePath, 'utf-8')
+      } else if (defaultModelExist) {
+        modelFile = await fsPromise.readFile(defaultFilePath, 'utf-8')
+      }
 
       const model = modelFile
-        ? (await fsPromise.readFile(filePath, 'utf-8'))
+        ? modelExist
           ? require(filePath)
           : require(defaultFilePath)
         : {}
@@ -235,11 +235,11 @@ exports.loadModel = async ({ app, appName }) => {
   const promise2 = app.model.model_attributes.bulkCreate(
     dataList
       .filter((item) => item.list.every((t) => t.type))
-      .reduce((a, b) => [...a, ...b.list], [])
+      .flatMap((b) => b.list)
   )
 
   await Promise.all([promise1, promise2])
-  console.log('lodaModel success!')
+  console.log('loadModel success!')
   if (currentDisabledFindAllList.length > 0) {
     console.warn(`当前disabledFindAllList不为空，查看需清空`)
   } else {

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

@@ -30,9 +30,6 @@ exports.copyOther = async (ctx) => {
 
   const findType = list.find((item) => item.code === type)
   if (findType && findType.parent_id) {
-    if (!findType) {
-      throw new Error(`当前找不到${type}`)
-    }
     await app.model.setting.upsert({
       id: findType.id,
       value: copyType.value,

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

@@ -261,13 +261,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
       })
   )
 
-  const obj = result.reduce(
-    (a, b) => ({
-      ...a,
-      ...b,
-    }),
-    {}
-  )
+  const obj = Object.assign({}, ...result)
   if (obj.setting && apiVersion && !cacheVersion) {
     console.log(`version没有后端缓存`)
   }

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

@@ -413,7 +413,7 @@ exports.cash = async ({
   })
 
   if (!user) throw new Error('找不到该用户')
-  if (!user.mp_user.openid) throw new Error('找不到该用户openid')
+  if (!user.mp_user || !user.mp_user.openid) throw new Error('找不到该用户openid')
 
   const { mchId, key, appId, partner_key } = await getAppConfig({
     app,

package/package.json

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