Merge branch 'master' of http://git.liuniu946.com/Kirin/mccs

crmeb/services/WechatService.php

@@ -112,11 +112,12 @@ class WechatService
                         case 'scan':
                             $response = WechatReply::reply('subscribe');
 //                            $response = (string)$message->EventKey;
-                            $qrInfo = QrcodeService::getQrcode($message->Ticket, 'ticket');
-                            $response = json_encode($qrInfo);
+//                            $qrInfo = QrcodeService::getQrcode($message->Ticket, 'ticket');
+//                            $response = json_encode($qrInfo);
                             if ($message->EventKey && ($qrInfo = QrcodeService::getQrcode($message->Ticket, 'ticket'))) {
                                 QrcodeService::scanQrcode($message->Ticket, 'ticket');
                                 if (strtolower($qrInfo['third_type']) == 'spread') {
+                                    $response = $qrInfo['third_id'];
                                     try {
                                         $spreadUid = $qrInfo['third_id'];
                                         $uid = WechatUser::openidToUid($message->FromUserName, 'openid');