From f31a92dbe7d4baff8d5706f02c5b84019e7dacde Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Fri, 24 May 2019 17:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/plugins/touristbuy/service/Service.php          | 6 +-----
 .../plugins/weixinwebauthorization/service/Service.php      | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/application/plugins/touristbuy/service/Service.php b/application/plugins/touristbuy/service/Service.php
index 97c2e7b43..8f8d9a986 100755
--- a/application/plugins/touristbuy/service/Service.php
+++ b/application/plugins/touristbuy/service/Service.php
@@ -49,11 +49,7 @@ class Service
             if(!empty($user))
             {
                 // 用户登录
-                $ret = UserService::Login(['accounts'=>$user['username'], 'pwd'=>$user['username']]);
-                if($ret['code'] == 0)
-                {
-                    return DataReturn('登录成功', 0, $ret['data']);
-                }
+                return UserService::UserLoginHandle($tourist_user_id, $params);
             }
             session('tourist_user_id', null);
         }
diff --git a/application/plugins/weixinwebauthorization/service/Service.php b/application/plugins/weixinwebauthorization/service/Service.php
index 6cdbb8110..e4fc888b1 100755
--- a/application/plugins/weixinwebauthorization/service/Service.php
+++ b/application/plugins/weixinwebauthorization/service/Service.php
@@ -55,7 +55,7 @@ class Service
         }
 
         // 用户名
-        $username = empty($params['nickname']) ? '微信'.RandomString(6) : $params['nickname'].RandomString(6);
+        $username = empty($params['nickname']) ? '微信-'.RandomString(6) : $params['nickname'].'-'.RandomString(6);
         if(mb_strlen($username, 'utf-8') > 18)
         {
             $username = mb_substr($username, 0, 18);