q-koa 12.0.6 → 12.0.7

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

@@ -1744,23 +1744,61 @@ exports.getUserPortrait = async (ctx) => {
   weixinMp.init()
 
   let obj = {}
+  const diff = moment().hour() > 8 ? -1 : -2
   if (type === 'day') {
     obj = {
-      begin_date: moment().add(-1, 'days').format('YYYYMMDD'),
-      end_date: moment().add(-1, 'days').format('YYYYMMDD'),
+      begin_date: moment().add(diff, 'days').format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   } else if (type === 'week') {
     obj = {
-      begin_date: moment().add(-7, 'days').format('YYYYMMDD'),
-      end_date: moment().add(-1, 'days').format('YYYYMMDD'),
+      begin_date: moment()
+        .add(-6 + diff, 'days')
+        .format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   } else if (type === 'month') {
     obj = {
-      begin_date: moment().add(-30, 'days').format('YYYYMMDD'),
-      end_date: moment().add(-1, 'days').format('YYYYMMDD'),
+      begin_date: moment()
+        .add(-29 + diff, 'days')
+        .format('YYYYMMDD'),
+      end_date: moment().add(diff, 'days').format('YYYYMMDD'),
     }
   }
+  console.log('obj', obj)
   const result = await weixinMp.getUserPortrait(obj)
 
   ctx.SUCCESS(result)
 }
+
+exports.getVisitTrend = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+  const appConfig = getConfig(app)
+
+  const { config = 'weixin_mp', type = 'day', date } = ctx.request.body
+  const { app_id, app_secrect } = await appConfig.getObject(config)
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+
+  weixinMp.init()
+
+  let obj = {}
+  const diff = moment().hour() > 8 ? -1 : -2
+  if (type === 'day') {
+    obj = {
+      begin_date: moment(date ? date : moment().add(diff, 'days')).format(
+        'YYYYMMDD'
+      ),
+      end_date: moment(date ? date : moment().add(diff, 'days')).format(
+        'YYYYMMDD'
+      ),
+    }
+  }
+
+  const result = await weixinMp.getVisitTrend({ ...obj, type })
+
+  ctx.SUCCESS(result)
+}

package/core/file/services/weixinMP.js

@@ -775,6 +775,44 @@ module.exports = class Singleton {
     return result
   }
 
+  async getVisitTrend(payLoad) {
+    const access_token = await this.getAccessToken()
+    let url = ''
+    if (payLoad.type === 'month') {
+      url = util.format(
+        'https://api.weixin.qq.com/datacube/getweanalysisappidmonthlyvisittrend?access_token=%s',
+        access_token
+      )
+    } else if (payLoad.type === 'week') {
+      url = util.format(
+        'https://api.weixin.qq.com/datacube/getweanalysisappidweeklyvisittrend?access_token=%s',
+        access_token
+      )
+    } else if (payLoad.type === 'day') {
+      url = util.format(
+        'https://api.weixin.qq.com/datacube/getweanalysisappiddailyvisittrend?access_token=%s',
+        access_token
+      )
+    }
+
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getVisitTrend(payLoad)
+      }
+      if (result.errcode === 61503) {
+        return null
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   getConfig() {
     return this.config
   }

package/package.json

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