q-koa 7.9.0 → 7.9.3

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

@@ -171,6 +171,99 @@ exports.getPhone = async (ctx) => {
   return ctx.SUCCESS({ phoneNumber })
 }
 
+exports.mp_getPhoneNew = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { code } = ctx.request.body
+
+  const user_id = ctx.request[appName + '-user'].id
+  const appConfig = getConfig(app)
+  const { app_id, app_secrect } = await appConfig.getObject('weixin_mp')
+
+  const weixinMp = new WeixinMp({
+    appid: app_id,
+    secrect: app_secrect,
+  })
+  weixinMp.init()
+
+  const { phoneNumber } = await weixinMp.getPhoneNumber(code)
+
+  if (!phoneNumber) throw new Error('微信获取手机失败，请重试')
+
+  const exist = await app.model.user.findOne({
+    where: {
+      mobile: phoneNumber,
+    },
+    include: [
+      {
+        model: app.model.mp_user,
+      },
+    ],
+  })
+
+  const mobileExist =
+    exist &&
+    exist.mp_user &&
+    (!exist.mp_user.appid || exist.mp_user.appid === app_id)
+
+  if (mobileExist) {
+    throw new Error('系统已存在该手机号')
+  }
+
+  await app.model.user.upsert({
+    id: user_id,
+    mobile: phoneNumber,
+  })
+
+  const result = await app.model.user.findOne({
+    where: {
+      id: user_id,
+    },
+    include: [
+      {
+        model: app.model.h5_user,
+      },
+      {
+        model: app.model.mp_user,
+      },
+      {
+        model: app.model.toutiao_user,
+      },
+      ...app.include.user,
+    ].filter((item) => item.model),
+  })
+
+  const tokenResult = {
+    id: result.id,
+    name: result.name,
+    mobile: result.mobile,
+    h5_user: result.h5_user
+      ? {
+          openid: result.h5_user && result.h5_user.openid,
+        }
+      : null,
+    mp_user: result.mp_user
+      ? {
+          openid: result.mp_user && result.mp_user.openid,
+        }
+      : null,
+    toutiao_user: result.toutiao_user
+      ? {
+          openid: result.toutiao_user && result.toutiao_user.openid,
+        }
+      : null,
+  }
+
+  const token = await app.sign({
+    user: tokenResult,
+  })
+
+  return ctx.SUCCESS({
+    token,
+    user: result,
+  })
+}
+
 /**
  * 微信小程序登录
  */
@@ -239,6 +332,19 @@ exports.mp_login = async (ctx) => {
         openid: post.openid,
       },
     })
+    if (app.attributes.user.mp_openid) {
+      app.model.user.update(
+        {
+          mp_openid: post.openid,
+        },
+        {
+          where: {
+            id: openIdUser.user_id,
+            mp_openid: '',
+          },
+        }
+      )
+    }
     uid = openIdUser.user_id
   } else {
     if (post.user_id) {
@@ -250,12 +356,14 @@ exports.mp_login = async (ctx) => {
     } else {
       try {
         await app.sequelize.transaction(async (transaction) => {
-          const user = await app.model.user.create(
-            {},
-            {
-              transaction,
-            }
-          )
+          const target = app.attributes.user.mp_openid
+            ? {
+                mp_openid: post.openid,
+              }
+            : {}
+          const user = await app.model.user.create(target, {
+            transaction,
+          })
           uid = user.id
           await app.model.mp_user.create(
             {
@@ -1043,8 +1151,33 @@ exports.checkPay = async (ctx) => {
       order: orderModel,
       order_id: id,
       order_price,
+      transaction_id: payResult.transaction_id,
     })
   }
 
   ctx.SUCCESS({ prefix, out_trade_no, ...payResult })
 }
+
+exports.init_mp_openid = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const list = await app.model.user.findAll({
+    where: {
+      mp_openid: '',
+    },
+    include: app.model.mp_user,
+  })
+
+  const result = list.map((item) => {
+    return {
+      id: item.id,
+      mp_openid: item.mp_user.openid,
+    }
+  })
+
+  await app.model.user.bulkCreate(result, {
+    updateOnDuplicate: ['mp_openid'],
+  })
+
+  ctx.SUCCESS(result.length)
+}

package/core/file/services/express.js

@@ -29,7 +29,7 @@ module.exports = class Singleton {
       },
     }).then((res) => res.data)
 
-    if (result.msg === 'ok') {
+    if (result.msg === 'ok' || result.status === '205') {
       return result.result
     } else {
       throw new Error(result.msg)

package/core/file/services/weixinMP.js

@@ -4,6 +4,8 @@ const axios = require('axios')
 const { lodash } = require('q-koa')
 const getAccessTokenUrl =
   'https://api.weixin.qq.com/cgi-bin/token?grant_type=%s&appid=%s&secret=%s'
+const getPhoneNumberUrl =
+  'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=%s'
 const createQRCodeUrl =
   'https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%s'
 const sendMessageUrl =
@@ -273,16 +275,27 @@ module.exports = class Singleton {
     if (result.errcode) {
       if (result.errcode === 40001) {
         cache.reset()
-        return await this.getLive({
-          start,
-          limit,
-        })
+        return await this.getLive(start, limit)
       }
       throw new Error(`${result.errcode};${result.errmsg}`)
     }
     return result.room_info
   }
 
+  async getPhoneNumber(code) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getPhoneNumberUrl, access_token)
+    const result = await axios.post(url, { code }).then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getPhoneNumber(code)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result.phone_info
+  }
+
   async createQR(options) {
     if (!this.config.targetPath) throw new Error('没有配置文件夹')
     const access_token = await this.getAccessToken()

package/package.json

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