Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into linqing

application/models/Business/User/MemberService.php

@@ -63,6 +63,12 @@ class MemberServiceModel extends \Business\AbstractModel
         }
         if($client=='seller'){
             $storeRedisDb0=\Redis\Db0\StoreRedisModel::getInstance();
+            $storeFd=$storeRedisDb0->tableHGet(trim($member['store_id']),'fd');
+            if(!empty($storeFd)){
+                $push=\Our\Push::getInstance();
+                $push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'op'=>NameConst::logOut,'num'=>\Our\ApiConst::zero,'params'=>array('c'=>'member','m'=>'logOut')));
+                $push->sendTcpMessage();
+            }
             $this->updataSellerToken($member);
             $member['sendTime']=TIMESTAMP;
             $storeRedisDb0->tableHMSet(trim($member['store_id']),$member,ApiConst::tenDaySecond);

application/modules/Client/controllers/User.php

@@ -72,9 +72,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     $member['seller_id']=$seller['sellerId'];
                     $member['seller_name']=$seller['sellerName'];
                     //通知退出
-                    $push=\Our\Push::getInstance();
-                    $push->addOneToClient(array('storeId'=>$member['store_id'],'type'=>\Our\ApiConst::messageOtherLogin,'op'=>NameConst::logOut,'num'=>0,'params'=>array('c'=>'member','m'=>'logOut')));
-                    $push->sendTcpMessage();
+
                     $this->memberService->saveMember($member,'seller');
                     $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberMobile'=>$member['member_mobile'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id'],'storeId'=>(int)$seller['storeId']));
                 }else{