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

application/controllers/Authinfo.php

@@ -37,8 +37,6 @@ class AuthinfoController extends \Our\Controller_Abstract
            $memberId=$this->sess->get('member_id');
            if(!empty($memberId)){
                $this->sess->set('other_login',\Our\ApiConst::one);
-           }else{
-
            }
 
        }else{

application/models/Business/User/MemberService.php

@@ -10,6 +10,7 @@ use Error\ErrorModel;
 use Our\ApiConst;
 use Our\Common;
 use Our\CommonExtension;
+use Our\DbNameConst;
 
 
 /**
@@ -46,8 +47,14 @@ class MemberServiceModel extends \Business\AbstractModel
         $user = $userM->update("UPDATE Member SET member_name='abc' WHERE member_id=1");
         return $user;
     }
-    public function saveMember($member){
-        $this->addOrUpdateMbUserToken($member);
+    public function saveMember($member,$client='member'){
+        if($client=='member'){
+            $this->addOrUpdateMbUserToken($member);
+        }
+        if($client=='seller'){
+            $this->updataSellerToken($member);
+        }
+
         foreach($member as $key =>$value){
             if(!$value){
                 $member[$key]=ApiConst::zero;
@@ -120,11 +127,20 @@ class MemberServiceModel extends \Business\AbstractModel
             'member_id' => $data['member_id'],
             'member_name' => $data['member_name'],
             'token' => $data['key'],
-            'login_time' => time(),
+            'login_time' => TIMESTAMP,
             'client_type' => Common::getDriverType(true),
         ];
         return $mbUserToken->insertOrUpdate($inserData);
     }
+    public function updataSellerToken($data)
+    {
+        $sellerDao = \DAO\Store\SellerModel::getInstance(DbNameConst::masterDBConnectName);
+        $inserData = [
+            'token' => $data['key'],
+            'last_login_time' => TIMESTAMP,
+        ];
+        return $sellerDao->updateBySellerId($inserData,$data['seller_id']);
+    }
 
     public function findMbUserTokenByMemberId($memberId)
     {

application/models/DAO/Store/Seller.php

@@ -32,7 +32,7 @@ class SellerModel extends \DAO\AbstractModel
      *
      * @var string
      */
-    protected $_primaryKey = 'id';
+    protected $_primaryKey = 'seller_id';
 
     public function init()
     {
@@ -80,9 +80,15 @@ class SellerModel extends \DAO\AbstractModel
      */
     public function update($data, $where)
     {
+        $this->setDb(DbNameConst::masterDBConnectName);
         return $this->db->update($this->_tableName)->where($where)->rows($data)->execute();
     }
 
+    public function updateBySellerId($data,$sellerId){
+        $where['seller_id']=$sellerId;
+        return $this->update($data,$where);
+    }
+
     /**
      * 插入数据
      * @param $data

application/modules/Client/controllers/User.php

@@ -40,11 +40,11 @@ class UserController extends \Our\Controller_AbstractIndex {
             }
             if($this->memberService->checkUserNamePassWord($mobile,$password)){
                 $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
-                //第二步保存扫码会员信息
-                $result = $this->memberService->saveStoreMembers($member['member_id']);
-                if(!$result){
-                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveStoreMemberFailed);
-                }
+//                //第二步保存扫码会员信息
+//                $result = $this->memberService->saveStoreMembers($member['member_id']);
+//                if(!$result){
+//                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveStoreMemberFailed);
+//                }
 //                /**
 //                 * 合并第三方授权信息
 //                 */
@@ -57,11 +57,7 @@ class UserController extends \Our\Controller_AbstractIndex {
 //                        $member = array_merge($member,$result['member']);
 //                    }
 //                }
-                $userToken=$this->memberService->findMbUserTokenByMemberId($member['member_id']);
-                if(!empty($userToken['token'])){
-                    $this->updateOldLoginKey($userToken['token']);
-                    //$this->memberService->clearKey($userToken['token']);
-                }
+              //  $userToken=$this->memberService->findMbUserTokenByMemberId($shopKeeperServvice['token']);
                 if($member){
                     $this->memberService->clearKey($this->key);
                     $this->key=Common::bulidToken($mobile,$password);
@@ -69,7 +65,9 @@ class UserController extends \Our\Controller_AbstractIndex {
                     $this->sess['member_id']=(int)$member['member_id'];
                     $this->sess[NameConst::sessionKey]=$this->key;
                     $member[NameConst::sessionKey]=$this->key;
-                    $this->memberService->saveMember($member);
+                    $member['store_id']=$seller['storeId'];
+                    $member['seller_id']=$seller['sellerId'];
+                    $this->memberService->saveMember($member,'seller');
                     $this->success(array('key'=>$this->key,'memberName'=>$member['member_name'],'memberAvatar'=>$member['memberAvatarUrl'],'memberId'=>(int)$member['member_id']));
                 }else{
                     ErrorModel::throwException(CodeConfigModel::errorUsernameOrPassword);