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

application/controllers/User.php

@@ -33,7 +33,7 @@ class UserController extends \Our\Controller_AbstractIndex {
             $password=$data[NameConst::password];
             if($this->memberService->checkUserNamePassWord($mobile,$password)){
                 $member= $this->memberService->getOneByMobileAndPassword($mobile,$password);
-                if($member['member_state']==\Our\ApiConst::zero){
+                if($member&&$member['member_state']==\Our\ApiConst::zero){
                     \Error\ErrorModel::throwException(\Error\CodeConfigModel::unavailMemberState);
                 }
                 //第二步保存扫码会员信息

application/models/Business/User/MemberCenterService.php

@@ -43,7 +43,6 @@ class MemberCenterServiceModel extends \Business\AbstractModel
                 'vibrate'=>ApiConst::openMessae,
             );
         }
-        $memberInfo['storeId'] ? $memberCenter['is'] = 1 : $memberCenter['isSeller'] = 0;
         //是否销售员
         $saleInstance = \DAO\SaleModel::getInstance();
         //$sale_act_id = \DAO\SaleModel::getInstance()->getOne(array('member_id'=>$memberId,'is_closing'=>0),'sale_act_id');

application/models/Business/User/MemberService.php

@@ -730,22 +730,45 @@ class MemberServiceModel extends \Business\AbstractModel
 
 
     public function changeMobile($data,$memberId){
-        $memberDao = \DAO\MemberModel::getInstance();
+        $memberDao = \DAO\MemberModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $memberDao->checkChangedInfo($data);
         //验证短信验证码
         $shortMessageDao = \DAO\ShortMessageModel::getInstance();
 
         $data['messageType'] = \Our\ApiConst::messageTypeValidNewMobile;
         $shortMessageDao->validCode($data);
-        $memberTime = $memberDao->getInfo($memberId,'member_time');
+        $memberTime= $memberDao->getInfo($memberId,'member_time');
         if(!$memberTime){
             $memberTime = TIMESTAMP;
         }
+        $oldMemberMobile= $memberDao->getInfo($memberId,'member_mobile');
         $passwordStr = $this->getRealPassword($data['password'],$memberTime);
+
+        $storeModel = \DAO\StoreModel::getInstance(\Our\DbNameConst::masterDBConnectName);
+        $store = $storeModel->getInfo(array('store_phone'=>$oldMemberMobile));
+        $memberDao->db->doTransaction();
         $result = $memberDao->updateInfo(array('member_passwd'=>md5($passwordStr),'member_mobile'=>$data['mobile'],'member_time'=>$memberTime,'member_mobile_bind'=>\Our\ApiConst::one),array('member_id'=>$memberId));
         if(!$result){
+            $memberDao->db->doRollback();
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::changeMobileFailed);
         }
+        if($store){
+            $storeResult = $storeModel->save(array('store_phone'=>$data['mobile']),array('store_id'=>$store['store_id']));
+            if($storeResult===false){
+                $memberDao->db->doRollback();
+                \Error\ErrorModel::throwException(\Error\CodeConfigModel::storePhoneUpdateFailed);
+            }
+        }
+        $sellerResult = \DAO\Store\SellerModel::getInstance(\Our\DbNameConst::masterDBConnectName)->update(array('seller_name'=>$data['mobile']),array('seller_name'=>$oldMemberMobile));
+        if($sellerResult===false){
+            $memberDao->db->doRollback();
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::sellerNameUpdateFailed);
+        }
+
+        $memberDao->db->doCommit();
+        if($store){
+            \Our\RedisHelper::delCachedFunction(\Redis\Db6\StoreRedisModel::getInstance(),array(&$storeModel, 'getInfoById'),array(),array($store['store_id']));
+        }
         $this->memberDb0Redis->tableHMSet($memberId,array('member_mobile'=>$data['mobile']),ApiConst::tenDaySecond);
         $shortMessageDao = \DAO\ShortMessageModel::getInstance();
         $shortMessageDao->delCodeRedis($data['key'],$data['mobile'],\Our\ApiConst::messageTypeValidNewMobile);

application/models/DAO/Member.php

@@ -261,7 +261,13 @@ class MemberModel extends \DAO\AbstractModel
     }
 
   }
-
+  public function updateMemberCache($memberId,$member) {
+      $memberDb0Redis = \Redis\Db0\MemberRedisModel::getInstance();
+      if($memberDb0Redis->tableExists($memberId)) {
+          return $memberDb0Redis->tableHMSet($memberId,$member);
+      }
+      return true;
+  }
   public function updateInfo($data, $where)
   {
     $this->setDb(\Our\DbNameConst::masterDBConnectName);

application/models/DAO/Store.php

@@ -269,7 +269,7 @@ class StoreModel extends \DAO\AbstractModel
     public function get($storeId,$label = true)
     {
         $storeInfo = $this->getStoreInfoCache($storeId);
-        if(!$storeInfo || $storeInfo['open_flag'] == 0 || $storeInfo['store_state'] != 1){
+        if(!$storeInfo || $storeInfo['open_flag'] != 1 || $storeInfo['store_state'] != 1){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::storeNotExistOrClose);
         }
 
@@ -467,4 +467,10 @@ class StoreModel extends \DAO\AbstractModel
         return $result;
     }
 
+    public function save($data,$where){
+        $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
+        return $result;
+    }
+
 }

application/models/DAO/Store/Seller.php

@@ -81,7 +81,8 @@ 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();
+        $result = $this->db->update($this->_tableName)->rows($data)->where($where)->execute();
+        return $result;
     }
 
     public function updateBySellerId($data,$sellerId){

application/models/Error/CodeConfig.php

@@ -100,7 +100,9 @@ class CodeConfigModel
     const uploadMemberAvatarFailed = 10112;
     const uploadWxMemberAvatarFailed = 10113;
     const unavailMemberState = 10114;
-    const notHaveAccess = 10115;
+    const storePhoneUpdateFailed = 10115;
+    const sellerNameUpdateFailed = 10116;
+    const notHaveAccess = 10117;
     //访问错误
     const illegalAccess = 200001;
 
@@ -503,7 +505,9 @@ class CodeConfigModel
             self::uploadMemberAvatarFailed => '上传用户头像失败',
             self::uploadWxMemberAvatarFailed => '微信上传用户头像失败',
             self::unavailMemberState => '您的账号已被禁用',
-            self::notHaveAccess=>'您没有权限使用',
+            self::storePhoneUpdateFailed => '更换手机时卖家手机号码更新失败',
+            self::sellerNameUpdateFailed => '更换手机时卖家手机号码更新失败',
+            self::notHaveAccess => '您没有权限使用',
             //商品相关
             self::emptyCommonId => '商品主键不能为空',
             self::goodsNotExist => '商品不存在',

application/models/Redis/Db0/MemberRedis.php

@@ -38,7 +38,9 @@ class MemberRedisModel extends \Redis\Db0\AbstractModel {
         }
         return null;
     }
-
+    public function tableExists($h){
+        return $this->exists($this->calcKey($h));
+    }
     /**
      * 更新数据
      *