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

application/controllers/Member.php

@@ -146,5 +146,4 @@ class MemberController extends \Our\Controller_AbstractApi {
         $this->success(new stdClass(),\Our\DescribeConst::bindMobileForWxSuccess,\Our\DescribeConst::bindMobileForWxSuccess);
     }
 
-
 }

application/models/Business/User/MemberService.php

@@ -146,6 +146,10 @@ class MemberServiceModel extends \Business\AbstractModel
             'sellerId'=>$member['sellerId'],
             'diliverymanId'=>$member['diliverymanId'],
         );
+
+        $returnMember['isWeiboBind'] = \Our\ApiConst::zero;
+        $returnMember['isQqBind'] = \Our\ApiConst::zero;
+        $returnMember['isWeiboBind'] = \Our\ApiConst::zero;
         $memberMappingDao = \DAO\MemberMappingModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $memberMappingList = $memberMappingDao->getAvailableMemberMappingList($memberId);
         foreach($memberMappingList as $memberMapping){
@@ -154,25 +158,11 @@ class MemberServiceModel extends \Business\AbstractModel
             }else if($memberMapping['user_type'] == \Our\ApiConst::userFromQQ){
                 $returnMember['isQqBind'] = \Our\ApiConst::one;
             }else if($memberMapping['user_type'] == \Our\ApiConst::wechatUserType){
-                //$returnMember['isWechatBind'] = \Our\ApiConst::one;
-
                 $returnMember['isWxBind'] = \Our\ApiConst::one;
             }else if($memberMapping['user_type'] == \Our\ApiConst::userFromWx){
                 $returnMember['isWxBind'] = \Our\ApiConst::one;
             }
         }
-        if(!isset($returnMember['isWeiboBind'])){
-            $returnMember['isWeiboBind'] = \Our\ApiConst::zero;
-        }
-        if(!isset($returnMember['isQqBind'])){
-            $returnMember['isQqBind'] = \Our\ApiConst::zero;
-        }
-        /*if(!isset($returnMember['isWechatBind'])){
-            $returnMember['isWechatBind'] = \Our\ApiConst::zero;
-        }*/
-        if(!isset($returnMember['isWxBind'])){
-            $returnMember['isWxBind'] = \Our\ApiConst::zero;
-        }
         return $returnMember;
     }
 
@@ -603,7 +593,7 @@ class MemberServiceModel extends \Business\AbstractModel
         $memberMappingDao = \DAO\MemberMappingModel::getInstance(\Our\DbNameConst::masterDBConnectName);
         $memberMappingDao->validCancelMapping($data,$memberId);
         $where['member_id'] = $memberId;
-        $where['user_type'] = ($data['userType']==\Our\ApiConst::userFromWx)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$data['userType'];
+        $where['user_type'] = ($data['userType']==\Our\ApiConst::userFromWx||$data['userType']==\Our\ApiConst::wechatUserType)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$data['userType'];
         $result = $memberMappingDao->del($where);
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::cancelBindingUserFailed);

application/models/DAO/MemberMapping.php

@@ -113,8 +113,11 @@ class MemberMappingModel extends \DAO\AbstractModel{
         if(!$where['userType']){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyUserType);
         }
+        if(!in_array($where['userType'],array_keys(\Our\ArrayConst::userType))){
+            \Error\ErrorModel::throwException(\Error\CodeConfigModel::wrongUserType);
+        }
         $condition['member_id'] = $memberId;
-        $condition['user_type'] = ($where['userType']==\Our\ApiConst::userFromWx)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$where['userType'];
+        $condition['user_type'] = ($where['userType']==\Our\ApiConst::userFromWx||$where['userType']==\Our\ApiConst::wechatUserType)?array('in',array(\Our\ApiConst::userFromWx,\Our\ApiConst::wechatUserType)):$where['userType'];
         $result = $this->find($condition,'member_id');
         if(!$result){
             \Error\ErrorModel::throwException(\Error\CodeConfigModel::bindingUserNotExist);
@@ -125,10 +128,11 @@ class MemberMappingModel extends \DAO\AbstractModel{
 
     public function del($where){
         $this->setDb(\Our\DbNameConst::masterDBConnectName);
+        $condition = $where ;
         if(is_array($where)){
-            $where = $this->db->getSqlWhereByArray($where);
+            $condition = $this->db->getSqlWhereByArray($where);
         }
-        $result  = $this->db->delete($this->_tableName)->where($where)->execute();
+        $result  = $this->db->delete($this->_tableName)->where($condition)->execute();
         if($result&&isset($where['member_id'])){
             \Our\RedisHelper::delCachedFunction(\Redis\Db0\MemberMappingRedisModel::getInstance(),array(&$this, 'getList'),array(),array($where['member_id']));
         }