feat 微信登录、支付失败返回错误信息

lisong3682 · Nov 15, 2019 · f3d95d6 · f3d95d6
1 parent 79b881a
commit f3d95d6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/src/api/controller/auth.js b/src/api/controller/auth.js
@@ -7,9 +7,9 @@ module.exports = class extends Base {
     const clientIp = this.ctx.ip;
 
     // 解释用户数据
-    const userInfo = await this.service('weixin', 'api').login(code, fullUserInfo);
-    if (think.isEmpty(userInfo)) {
-      return this.fail('登录失败');
+    const { errno, errmsg, data: userInfo } = await this.service('weixin', 'api').login(code, fullUserInfo);
+    if (errno !== 0) {
+      return this.fail(errno, errmsg);
     }
 
     // 根据openid查找用户是否已经注册
@@ -41,8 +41,8 @@ module.exports = class extends Base {
     const TokenSerivce = this.service('token', 'api');
     const sessionKey = await TokenSerivce.create({ user_id: userId });
 
-    if (think.isEmpty(newUserInfo) || think.isEmpty(sessionKey)) {
-      return this.fail('登录失败');
+    if (think.isEmpty(sessionKey)) {
+      return this.fail('生成 token 失败');
     }
 
     return this.success({ token: sessionKey, userInfo: newUserInfo });

diff --git a/src/api/controller/pay.js b/src/api/controller/pay.js
@@ -18,7 +18,7 @@ module.exports = class extends Base {
     }
     const openid = await this.model('user').where({ id: orderInfo.user_id }).getField('weixin_openid', true);
     if (think.isEmpty(openid)) {
-      return this.fail('微信支付失败');
+      return this.fail('微信支付失败 openid empty');
     }
     const WeixinSerivce = this.service('weixin', 'api');
     try {
@@ -31,7 +31,7 @@ module.exports = class extends Base {
       });
       return this.success(returnParams);
     } catch (err) {
-      return this.fail('微信支付失败');
+      return this.fail(400, `微信支付失败 ${err.err_code_des || err.return_msg}`);
     }
   }
 

diff --git a/src/api/service/weixin.js b/src/api/service/weixin.js
@@ -20,23 +20,20 @@ module.exports = class extends think.Service {
       let sessionData = await rp(options);
       sessionData = JSON.parse(sessionData);
       if (!sessionData.openid) {
-        return null;
+        return { errno: sessionData.errcode, errmsg: sessionData.errmsg, data: null };
       }
 
       // 验证用户信息完整性
       const sha1 = crypto.createHash('sha1').update(fullUserInfo.rawData.toString() + sessionData.session_key).digest('hex');
       if (fullUserInfo.signature !== sha1) {
-        return null;
+        return { errno: 400, errmsg: `signature 校验不一致`, data: null };
       }
 
       // 解析用户数据
       const wechatUserInfo = await this.decryptUserInfoData(sessionData.session_key, fullUserInfo.encryptedData, fullUserInfo.iv);
-      if (think.isEmpty(wechatUserInfo)) {
-        return null;
-      }
       return wechatUserInfo;
     } catch (e) {
-      return null;
+      return { errno: 400, errmsg: '微信登录失败：' + e.message, data: null };
     }
   }
 
@@ -61,7 +58,7 @@ module.exports = class extends think.Service {
       decoded += decipher.final('utf8');
       const userInfo = JSON.parse(decoded);
       if (userInfo.watermark.appid !== think.config('weixin.appid')) {
-        return null;
+        return { errno: 400, errmsg: 'watermark appid 错误', data: null };
       }
 
       // 解析后的数据格式
@@ -74,9 +71,9 @@ module.exports = class extends think.Service {
       //   country: 'China',
       //   avatarUrl: 'https://wx.qlogo.cn/mmopen/vi_32/9Otwibfa5VXR0ntXdlX84dibbulWLJ0EiacHeAfT1ShG2A7LQa2unfbZVohsWQlmXbwQGM6NnhGFWicY5icdxFVdpLQ/132',
       //   watermark: { timestamp: 1542639764, appid: 'wx262f4ac3b1c477dd' } }
-      return userInfo;
+      return { errno: 0, errmsg: '', data: userInfo };
     } catch (err) {
-      return null;
+      return { errno: 500, errmsg: '解析用户数据错误：' + err.message, data: null };
     }
   }