用户登录修改

application/controllers/User.php

@@ -33,6 +33,9 @@ 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']){
+                    \Error\ErrorModel::throwException(\Error\CodeConfigModel::saveStoreMemberFailed);
+                }
                 //第二步保存扫码会员信息
                 $result = $this->memberService->saveStoreMembers($member['member_id']);
                 if(!$result){
@@ -46,7 +49,7 @@ class UserController extends \Our\Controller_AbstractIndex {
                     if(!$result['status']){
                         \Error\ErrorModel::throwException(\Error\CodeConfigModel::loginBindUserInfoFailed);
                     }
-                        if(isset($result['member'])&&$member){
+                    if(isset($result['member'])&&$member){
                         $member = array_merge($member,$result['member']);
                     }
                 }

application/models/Business/User/MemberService.php

@@ -772,6 +772,7 @@ class MemberServiceModel extends \Business\AbstractModel
         }
         $memberMappings = $memberMappingDao->getList($condition,'member_id');
         //$memberMapping = \Our\RedisHelper::cachedFunction(\Redis\Db0\MemberMappingRedisModel::getInstance(),array(&$memberMappingDao, 'find'),array($condition,'member_id'),\Our\ApiConst::tenDaySecond);
+        var_dump($memberMappings);
         if($memberMappings){
             $memberIds = array_column($memberMappings,'member_id');
             $member = $memberDao->getMemberForLogin($memberIds);

application/models/DAO/Member.php

@@ -23,6 +23,10 @@ class MemberModel extends \DAO\AbstractModel
     //有效用户返回数据
     private $availMemberColumn = array('member_id', 'member_name', 'member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend');
 
+
+    //有效用户返回数据
+    private $memberColumn = array('member_id', 'member_name', 'member_truename', 'member_avatar', 'member_sex', 'member_birthday', 'member_mobile', 'member_mobile_bind', 'member_qq', 'member_qqopenid', 'member_qqinfo', 'member_wxinfo', 'member_wxopenid', 'member_sinaopenid', 'member_sinainfo', 'member_points', 'member_state', 'member_quicklink', 'member_exppoints', 'store_id', 'iswx', 'agree_flag', 'seller_id', 'diliveryman_id', 'member_tag_ids', 'member_group_ids', 'is_teacher', 'member_email', 'member_email_bind','is_wxsend','member_state');
+
     public function init()
     {
         $this->memberMysql = \Mysql\MemberModel::getInstance();
@@ -98,7 +102,7 @@ class MemberModel extends \DAO\AbstractModel
             $where[NameConst::memberPasswd]=md5($password);
         }
 
-        $result = $this->db->select($this->availMemberColumn)->from($this->_tableName)->where($where)->fetchOne();
+        $result = $this->db->select($this->memberColumn)->from($this->_tableName)->where($where)->fetchOne();
         if ($result) {
             $memberAvatarUrl = $this->getMemberAvatarUrl($result['member_id'], $result['member_avatar']);
             $result['memberAvatarUrl'] = $memberAvatarUrl;

application/models/Error/CodeConfig.php

@@ -98,6 +98,7 @@ class CodeConfigModel {
     const authMemberExistMobile = 10111;
     const uploadMemberAvatarFailed = 10112;
     const uploadWxMemberAvatarFailed = 10113;
+    const unavailMemberState = 10114;
 
     //访问错误
     const illegalAccess=200001;
@@ -461,7 +462,7 @@ class CodeConfigModel {
             self::userAlreadyBind => '当前账号已被其他账号绑定,如需绑定,请先解绑',
             self::emptyPlatformType => '第三方平台类型不能为空',
             self::wrongPlatformInfo => '获取平台授权信息错误',
-            self::loginBindUserInfoFailed => '登录是绑定用户信息失败',
+            self::loginBindUserInfoFailed => '登录时绑定用户信息失败',
             self::cancelBindingUserFailed => '取消第三方绑定失败',
             self::emptyUserOpenid => '第三方用户唯一识别符不能为空',
             self::bindingSuccess => '绑定成功',
@@ -504,6 +505,7 @@ class CodeConfigModel {
             self::saveMemberMapppingFailed => '保存用户第三方绑定信息失败',
             self::uploadMemberAvatarFailed => '上传用户头像失败',
             self::uploadWxMemberAvatarFailed => '微信上传用户头像失败',
+            self::unavailMemberState => '您的账号已被禁用',
             //商品相关
             self::emptyCommonId=> '商品主键不能为空',
             self::goodsNotExist=> '商品不存在',